Commit 3b108b9
authored
Support for Management Server Maintenance Mode (#9854)
* Support for Management Server Maintenance
- New APIs: prepareForMaintenance and cancelMaintenance, with required parameter - managementserverid.
- New management server states for maintenance: PreparingForMaintenance, Maintenance.
- listHosts API with optional parameter – managementserverid, to list the hosts connected to the management server.
- Support management server maintenance when more than one active management servers available.
- Triggers transfer agents to other available management servers for maintenance, new agent command MigrateAgentConnectionCommand to initiate transfer of indirect agents.
- New global config 'management.server.maintenance.timeout', to set the timeout (in mins) for the management server maintenance window, default: 60 mins.
- UI changes: Prepare and Cancel Maintenance in Management Server section, Connected Agents tab, New fields for hosts and management servers.
* Updated pending jobs check timer task with ScheduledExecutorService
* keep maintenance state on trigger shutdown call when ms is in maintenance
* add pending jobs count to ms response
* during ms heartbeat, update state to up only when it's down
* allow vm work jobs of async job created before prepare for maintenance
* Revert "keep maintenance state on trigger shutdown call when ms is in maintenance"
This reverts commit 607e133.
* skip maintenance test when multiple management servers are not available, and not configured in host setting for kvm1 parent 048649d commit 3b108b9
File tree
105 files changed
+2672
-713
lines changed- agent/src/main/java/com/cloud/agent
- api/src/main/java
- com/cloud
- host
- resource
- server
- org/apache/cloudstack
- api
- command/admin/host
- response
- management
- client
- core/src
- main/java/com/cloud
- agent/api
- resource
- test/java/org/apache/cloudstack/api/agent/test
- engine
- components-api/src/main/java/com/cloud
- agent
- resource
- orchestration
- src/main/java
- com/cloud
- agent/manager
- cluster
- org/apache/cloudstack/engine
- datacenter/entity/api/db
- orchestration
- schema/src/main
- java/com/cloud/host
- dao
- resources/META-INF/db
- framework
- agent-lb/src/main/java/org/apache/cloudstack/agent/lb
- cluster/src/main/java/com/cloud/cluster
- dao
- jobs/src/main/java/org/apache/cloudstack/framework/jobs/impl
- plugins
- hypervisors
- vmware/src/main/java/com/cloud/hypervisor/vmware/resource
- xenserver/src/main/java
- com/cloud/hypervisor/xenserver/resource
- org/apache/cloudstack/hypervisor/xenserver
- maintenance
- src
- main
- java/org/apache/cloudstack
- api
- command
- response
- maintenance
- command
- resources/META-INF/cloudstack/maintenance
- test/java/org/apache/cloudstack/maintenance
- metrics/src/main/java/org/apache/cloudstack
- api
- metrics
- response
- shutdown/src/main/java/org/apache/cloudstack/shutdown
- server/src
- main
- java
- com/cloud
- api
- query
- dao
- network
- security
- resource
- server
- storage/listener
- org/apache/cloudstack/agent/lb
- resources/META-INF/cloudstack/core
- test
- java/com/cloud/resource
- resources
- test/integration/smoke
- tools/apidoc
- ui
- public/locales
- src
- components
- page
- view
- config/section/infra
- store
- modules
- views
- infra
- utils/src/main/java/com/cloud/utils/nio
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
105 files changed
+2672
-713
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| 30 | + | |
30 | 31 | | |
31 | 32 | | |
32 | 33 | | |
| |||
40 | 41 | | |
41 | 42 | | |
42 | 43 | | |
| 44 | + | |
| 45 | + | |
43 | 46 | | |
44 | 47 | | |
45 | 48 | | |
| |||
313 | 316 | | |
314 | 317 | | |
315 | 318 | | |
316 | | - | |
317 | 319 | | |
318 | 320 | | |
319 | 321 | | |
| |||
477 | 479 | | |
478 | 480 | | |
479 | 481 | | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
480 | 486 | | |
481 | 487 | | |
482 | 488 | | |
483 | 489 | | |
484 | 490 | | |
485 | 491 | | |
486 | 492 | | |
| 493 | + | |
487 | 494 | | |
488 | 495 | | |
489 | 496 | | |
| |||
541 | 548 | | |
542 | 549 | | |
543 | 550 | | |
544 | | - | |
| 551 | + | |
| 552 | + | |
| 553 | + | |
| 554 | + | |
| 555 | + | |
545 | 556 | | |
546 | 557 | | |
| 558 | + | |
547 | 559 | | |
548 | 560 | | |
549 | 561 | | |
| |||
575 | 587 | | |
576 | 588 | | |
577 | 589 | | |
| 590 | + | |
| 591 | + | |
| 592 | + | |
| 593 | + | |
| 594 | + | |
578 | 595 | | |
579 | | - | |
580 | | - | |
581 | | - | |
582 | | - | |
583 | | - | |
584 | | - | |
585 | | - | |
586 | | - | |
| 596 | + | |
| 597 | + | |
| 598 | + | |
587 | 599 | | |
588 | | - | |
589 | | - | |
590 | | - | |
| 600 | + | |
| 601 | + | |
| 602 | + | |
| 603 | + | |
| 604 | + | |
| 605 | + | |
| 606 | + | |
| 607 | + | |
| 608 | + | |
591 | 609 | | |
592 | 610 | | |
593 | 611 | | |
| 612 | + | |
594 | 613 | | |
595 | 614 | | |
596 | 615 | | |
| |||
703 | 722 | | |
704 | 723 | | |
705 | 724 | | |
| 725 | + | |
| 726 | + | |
706 | 727 | | |
707 | 728 | | |
708 | 729 | | |
| |||
858 | 879 | | |
859 | 880 | | |
860 | 881 | | |
| 882 | + | |
| 883 | + | |
| 884 | + | |
| 885 | + | |
| 886 | + | |
| 887 | + | |
| 888 | + | |
| 889 | + | |
| 890 | + | |
| 891 | + | |
| 892 | + | |
| 893 | + | |
| 894 | + | |
| 895 | + | |
| 896 | + | |
| 897 | + | |
| 898 | + | |
| 899 | + | |
| 900 | + | |
| 901 | + | |
| 902 | + | |
| 903 | + | |
| 904 | + | |
| 905 | + | |
| 906 | + | |
| 907 | + | |
| 908 | + | |
| 909 | + | |
| 910 | + | |
| 911 | + | |
| 912 | + | |
| 913 | + | |
| 914 | + | |
| 915 | + | |
| 916 | + | |
| 917 | + | |
| 918 | + | |
| 919 | + | |
| 920 | + | |
| 921 | + | |
| 922 | + | |
| 923 | + | |
| 924 | + | |
| 925 | + | |
| 926 | + | |
| 927 | + | |
| 928 | + | |
861 | 929 | | |
862 | 930 | | |
863 | 931 | | |
| |||
1153 | 1221 | | |
1154 | 1222 | | |
1155 | 1223 | | |
1156 | | - | |
| 1224 | + | |
| 1225 | + | |
1157 | 1226 | | |
1158 | 1227 | | |
1159 | 1228 | | |
| |||
1178 | 1247 | | |
1179 | 1248 | | |
1180 | 1249 | | |
| 1250 | + | |
1181 | 1251 | | |
1182 | 1252 | | |
1183 | 1253 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
| 80 | + | |
80 | 81 | | |
81 | 82 | | |
82 | 83 | | |
| |||
215 | 216 | | |
216 | 217 | | |
217 | 218 | | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
218 | 227 | | |
219 | 228 | | |
220 | 229 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
73 | 77 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
177 | 177 | | |
178 | 178 | | |
179 | 179 | | |
| 180 | + | |
| 181 | + | |
180 | 182 | | |
181 | 183 | | |
182 | 184 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
127 | 127 | | |
128 | 128 | | |
129 | 129 | | |
| 130 | + | |
130 | 131 | | |
131 | 132 | | |
132 | 133 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
| 30 | + | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
54 | | - | |
| 54 | + | |
55 | 55 | | |
56 | 56 | | |
57 | 57 | | |
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
72 | | - | |
| 72 | + | |
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
| |||
Lines changed: 5 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
70 | 71 | | |
71 | 72 | | |
72 | 73 | | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
73 | 78 | | |
74 | 79 | | |
75 | 80 | | |
| |||
Lines changed: 4 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1136 | 1136 | | |
1137 | 1137 | | |
1138 | 1138 | | |
1139 | | - | |
| 1139 | + | |
1140 | 1140 | | |
| 1141 | + | |
1141 | 1142 | | |
| 1143 | + | |
| 1144 | + | |
1142 | 1145 | | |
1143 | 1146 | | |
1144 | 1147 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
36 | | - | |
| 36 | + | |
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
| |||
Lines changed: 8 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
| 34 | + | |
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
| |||
105 | 106 | | |
106 | 107 | | |
107 | 108 | | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
108 | 112 | | |
109 | 113 | | |
110 | 114 | | |
| |||
189 | 193 | | |
190 | 194 | | |
191 | 195 | | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
192 | 200 | | |
193 | 201 | | |
194 | 202 | | |
| |||
0 commit comments