Skip to content

Commit 1034139

Browse files
authored
Merge pull request #282162 from KaiqianYang/kaiqianyang/fix-spring-memory-doc
remove enterprise scope for concepts-for-java-memory-management
2 parents 7aa3a49 + 8a8aedc commit 1034139

File tree

12 files changed

+25
-29
lines changed

12 files changed

+25
-29
lines changed

articles/spring-apps/.openpublishing.redirection.spring-apps.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,12 @@
212212
},
213213
{
214214
"source_path": "concepts-for-java-memory-management.md",
215-
"redirect_url": "/azure/spring-apps/enterprise/concepts-for-java-memory-management",
215+
"redirect_url": "/azure/spring-apps/basic-standard/concepts-for-java-memory-management",
216+
"redirect_document_id": false
217+
},
218+
{
219+
"source_path": "enterprise/concepts-for-java-memory-management.md",
220+
"redirect_url": "/azure/spring-apps/basic-standard/concepts-for-java-memory-management",
216221
"redirect_document_id": true
217222
},
218223
{

articles/spring-apps/enterprise/concepts-for-java-memory-management.md renamed to articles/spring-apps/basic-standard/concepts-for-java-memory-management.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: KarlErickson
66
ms.author: kaiqianyang
77
ms.service: spring-apps
88
ms.topic: conceptual
9-
ms.date: 06/27/2024
9+
ms.date: 07/30/2024
1010
ms.custom: devx-track-java, devx-track-extended-java
1111
---
1212

@@ -15,7 +15,7 @@ ms.custom: devx-track-java, devx-track-extended-java
1515
> [!NOTE]
1616
> Azure Spring Apps is the new name for the Azure Spring Cloud service. Although the service has a new name, you'll see the old name in some places for a while as we work to update assets such as screenshots, videos, and diagrams.
1717
18-
**This article applies to:** ✔️ Basic/Standard ✔️ Enterprise
18+
**This article applies to:** ✔️ Basic/Standard Enterprise
1919

2020
This article describes various concepts related to Java memory management to help you understand the behavior of Java applications hosted in Azure Spring Apps.
2121

@@ -27,7 +27,7 @@ A Java application's memory has several parts, and there are different ways to d
2727

2828
Heap memory stores all class instances and arrays. Each Java virtual machine (JVM) has only one heap area, which is shared among threads.
2929

30-
Spring Boot Actuator can observe the value of heap memory. Spring Boot Actuator takes the heap value as part of `jvm.memory.used/committed/max`. For more information, see the [jvm.memory.used/committed/max](tools-to-troubleshoot-memory-issues.md#jvmmemoryusedcommittedmax) section in [Tools to troubleshoot memory issues](tools-to-troubleshoot-memory-issues.md).
30+
Spring Boot Actuator can observe the value of heap memory. Spring Boot Actuator takes the heap value as part of `jvm.memory.used/committed/max`. For more information, see the [jvm.memory.used/committed/max](../enterprise/tools-to-troubleshoot-memory-issues.md#jvmmemoryusedcommittedmax) section in [Tools to troubleshoot memory issues](../enterprise/tools-to-troubleshoot-memory-issues.md).
3131

3232
Heap memory is divided into *young generation* and *old generation*. These terms are described in the following list, along with related terms.
3333

@@ -72,7 +72,7 @@ Full GC or major GC does garbage collection in the entire heap. Full GC can also
7272

7373
The maximum heap size influences the frequency of minor GC and full GC. The maximum metaspace and maximum direct memory size influence full GC.
7474

75-
When you set the maximum heap size to a lower value, garbage collections occur more frequently, which slow the app a little, but better limits the memory usage. When you set the maximum heap size to a higher value, garbage collections occur less frequently, which may create more out-of-memory (OOM) risk. For more information, see the [Types of out-of-memory issues](how-to-fix-app-restart-issues-caused-by-out-of-memory.md#types-of-out-of-memory-issues) section of [App restart issues caused by out-of-memory issues](how-to-fix-app-restart-issues-caused-by-out-of-memory.md).
75+
When you set the maximum heap size to a lower value, garbage collections occur more frequently, which slow the app a little, but better limits the memory usage. When you set the maximum heap size to a higher value, garbage collections occur less frequently, which may create more out-of-memory (OOM) risk. For more information, see the [Types of out-of-memory issues](../enterprise/how-to-fix-app-restart-issues-caused-by-out-of-memory.md#types-of-out-of-memory-issues) section of [App restart issues caused by out-of-memory issues](../enterprise/how-to-fix-app-restart-issues-caused-by-out-of-memory.md).
7676

7777
Metaspace and direct memory can be collected only by full GC. When metaspace or direct memory is full, full GC will occur.
7878

@@ -86,7 +86,7 @@ Applications in Azure Spring Apps run in container environments. For more inform
8686

8787
### Important JVM options
8888

89-
You can configure the maximum size of each part of memory by using JVM options. You can set JVM options by using Azure CLI commands or through the Azure portal. For more information, see the [Modify configurations to fix problems](tools-to-troubleshoot-memory-issues.md#modify-configurations-to-fix-problems) section of [Tools to troubleshoot memory issues](tools-to-troubleshoot-memory-issues.md).
89+
You can configure the maximum size of each part of memory by using JVM options. You can set JVM options by using Azure CLI commands or through the Azure portal. For more information, see the [Modify configurations to fix problems](../enterprise/tools-to-troubleshoot-memory-issues.md#modify-configurations-to-fix-problems) section of [Tools to troubleshoot memory issues](../enterprise/tools-to-troubleshoot-memory-issues.md).
9090

9191
The following list describes the JVM options:
9292

@@ -156,9 +156,9 @@ Overall, when configuring maximum memory sizes, you should consider the usage of
156156

157157
## Java OOM
158158

159-
OOM means the application is out of memory. There are two different concepts: container OOM and JVM OOM. For more information, see [App restart issues caused by out-of-memory issues](how-to-fix-app-restart-issues-caused-by-out-of-memory.md).
159+
OOM means the application is out of memory. There are two different concepts: container OOM and JVM OOM. For more information, see [App restart issues caused by out-of-memory issues](../enterprise/how-to-fix-app-restart-issues-caused-by-out-of-memory.md).
160160

161161
## See also
162162

163-
- [App restart issues caused by out-of-memory issues](how-to-fix-app-restart-issues-caused-by-out-of-memory.md)
164-
- [Tools to troubleshoot memory issues](tools-to-troubleshoot-memory-issues.md)
163+
- [App restart issues caused by out-of-memory issues](../enterprise/how-to-fix-app-restart-issues-caused-by-out-of-memory.md)
164+
- [Tools to troubleshoot memory issues](../enterprise/tools-to-troubleshoot-memory-issues.md)

articles/spring-apps/basic-standard/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ items:
6969
- name: Memory
7070
items:
7171
- name: Java memory management
72-
href: ../enterprise/concepts-for-java-memory-management.md?toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json
72+
href: concepts-for-java-memory-management.md
7373
- name: Tools to troubleshoot memory issues
7474
href: ../enterprise/tools-to-troubleshoot-memory-issues.md?toc=/azure/spring-apps/basic-standard/toc.json&bc=/azure/spring-apps/basic-standard/breadcrumb/toc.json
7575
- name: Fix app restart issues caused by OOM

articles/spring-apps/consumption-dedicated/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ landingContent:
9595
- linkListType: concept
9696
links:
9797
- text: Java memory management
98-
url: ../enterprise/concepts-for-java-memory-management.md?toc=/azure/spring-apps/consumption-dedicated/toc.json&bc=/azure/spring-apps/consumption-dedicated/breadcrumb/toc.json
98+
url: ../basic-standard/concepts-for-java-memory-management.md?toc=/azure/spring-apps/consumption-dedicated/toc.json&bc=/azure/spring-apps/consumption-dedicated/breadcrumb/toc.json
9999
- linkListType: quickstart
100100
links:
101101
- text: Analyze logs and metrics

articles/spring-apps/consumption-dedicated/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ items:
5353
- name: Memory
5454
items:
5555
- name: Java memory management
56-
href: ../enterprise/concepts-for-java-memory-management.md?toc=/azure/spring-apps/consumption-dedicated/toc.json&bc=/azure/spring-apps/consumption-dedicated/breadcrumb/toc.json
56+
href: ../basic-standard/concepts-for-java-memory-management.md?toc=/azure/spring-apps/consumption-dedicated/toc.json&bc=/azure/spring-apps/consumption-dedicated/breadcrumb/toc.json
5757
- name: Tools to troubleshoot memory issues
5858
href: ../enterprise/tools-to-troubleshoot-memory-issues.md?toc=/azure/spring-apps/consumption-dedicated/toc.json&bc=/azure/spring-apps/consumption-dedicated/breadcrumb/toc.json
5959
- name: Fix app restart issues caused by OOM

articles/spring-apps/enterprise/how-to-fix-app-restart-issues-caused-by-out-of-memory.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The **Resource health** page on the Azure portal shows app restart events due to
4343

4444
The metrics *App memory Usage*, `jvm.memory.used`, and `jvm.memory.committed` provide a view of memory usage. For more information, see the [Metrics](tools-to-troubleshoot-memory-issues.md#metrics) section of [Tools to troubleshoot memory issues](tools-to-troubleshoot-memory-issues.md). Configure the maximum memory sizes in JVM options to ensure that memory is under the limit.
4545

46-
The sum of the maximum memory sizes of all the parts in the [Java memory model](concepts-for-java-memory-management.md#java-memory-model) should be less than the real available app memory. To set your maximum memory sizes, see the typical memory layout described in the [Memory usage layout](concepts-for-java-memory-management.md#memory-usage-layout) section of [Java memory management](concepts-for-java-memory-management.md).
46+
The sum of the maximum memory sizes of all the parts in the [Java memory model](../basic-standard/concepts-for-java-memory-management.md#java-memory-model) should be less than the real available app memory. To set your maximum memory sizes, see the typical memory layout described in the [Memory usage layout](../basic-standard/concepts-for-java-memory-management.md#memory-usage-layout) section of [Java memory management](../basic-standard/concepts-for-java-memory-management.md).
4747

4848
Find a balance when you set the maximum memory size. When you set the maximum memory size too high, there's a risk of container OOM. When you set the maximum memory size too low, there's a risk of JVM OOM, and garbage collection will be of and will slow down the app.
4949

@@ -70,5 +70,5 @@ Metaspace memory is usually stable.
7070

7171
## See also
7272

73-
- [Java memory management](concepts-for-java-memory-management.md)
73+
- [Java memory management](../basic-standard/concepts-for-java-memory-management.md)
7474
- [Tools to troubleshoot memory issues](tools-to-troubleshoot-memory-issues.md)

articles/spring-apps/enterprise/index.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,6 @@ landingContent:
112112
url: structured-app-log.md
113113
- text: Analyze logs and metrics
114114
url: diagnostic-services.md
115-
- linkListType: concept
116-
links:
117-
- text: Java memory management
118-
url: concepts-for-java-memory-management.md
119115

120116
# Card (optional)
121117
- title: Secure apps

articles/spring-apps/enterprise/toc.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,6 @@ items:
8282
href: concept-app-status.md
8383
- name: Memory
8484
items:
85-
- name: Java memory management
86-
href: concepts-for-java-memory-management.md
8785
- name: Tools to troubleshoot memory issues
8886
href: tools-to-troubleshoot-memory-issues.md
8987
- name: Fix app restart issues caused by OOM

0 commit comments

Comments
 (0)