Skip to content

Commit a809f49

Browse files
authored
fix Sys and process monitoring lab (#1750)
merge commit for #1750
1 parent d1303a7 commit a809f49

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

docs/labs/systems_administration_I/lab8-system_and_process_monitoring-I.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,11 @@ What processes are using the most memory?
284284

285285
## Exercise 4
286286

287+
<<<<<<< HEAD
288+
### Changing Process Priority with nice and renice
289+
=======
287290
### Changing Process Priority with nice
291+
>>>>>>> upstream/main
288292

289293
#### To adjust process priority using nice
290294

@@ -814,6 +818,8 @@ Is the process listed in the "mygroup" cgroup?
814818
815819
!!! Question
816820
Explain the concept of cgroups in Linux and how they can be used to manage and control resource allocation for processes.
821+
<<<<<<< HEAD
822+
=======
817823
818824
## Exercise 13
819825
@@ -851,3 +857,4 @@ What happens to the process's resource consumption with different nice values?
851857
852858
!!! Question
853859
Explain how the renice command is used to adjust the priority of running processes and its effects on process resource utilization.
860+
>>>>>>> upstream/main

0 commit comments

Comments
 (0)