Skip to content

Management Server - Prepare for Maintenance and Cancel Maintenance improvements #10995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sureshanaparti merged 7 commits into from
Jul 3, 2025
Merged

Management Server - Prepare for Maintenance and Cancel Maintenance improvements #10995

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4c80b61
Management Server - Prepare for Maintenance and Cancel Maintenance im…
sureshanaparti Jun 10, 2025
30e4796
rebases fixes
sureshanaparti Jun 10, 2025
835a5ab
code improvements, cleanup
sureshanaparti Jun 10, 2025
0f945ba
[UI] Set rebalance true by default in cancel maintenance dialog
sureshanaparti Jun 20, 2025
e2c590d
Update MS state after executing cluster cmd in the target MS, and som…
sureshanaparti Jun 24, 2025
718c283
code improvements
sureshanaparti Jun 27, 2025
fba3483
Ensure the host lb algorithm 'shuffle' is applied once before disabli…
sureshanaparti Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ui/src/config/section/infra/managementServers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ export default {
icon: 'close-circle-outlined',
label: 'label.cancel.shutdown',
message: 'message.cancel.shutdown',
docHelp: 'installguide/configuration.html#adding-a-zone',
dataView: true,
popup: true,
show: (record, store) => { return ['PreparingForShutDown', 'ReadyToShutDown', 'ShuttingDown'].includes(record.state) },
Expand Down
8 changes: 7 additions & 1 deletion ui/src/views/AutogenView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@ export default {
this.getFirstIndexFocus()

this.showAction = true
const listIconForFillValues = ['copy-outlined', 'CopyOutlined', 'edit-outlined', 'EditOutlined', 'share-alt-outlined', 'ShareAltOutlined']
const listIconForFillValues = ['copy-outlined', 'CopyOutlined', 'edit-outlined', 'EditOutlined', 'share-alt-outlined', 'ShareAltOutlined', 'minus-square-outlined']
for (const param of this.currentAction.paramFields) {
if (param.type === 'list' && ['tags', 'hosttags', 'storagetags', 'storageaccessgroups', 'files'].includes(param.name)) {
param.type = 'string'
Expand Down Expand Up @@ -1415,6 +1415,8 @@ export default {
fieldValue = this.resource[fieldName] ? this.resource[fieldName] : null
if (fieldValue) {
this.form[field.name] = fieldValue
} else if (field.type === 'boolean' && field.name === 'rebalance' && this.currentAction.api === 'cancelMaintenance') {
this.form[field.name] = true
}
})
},
Expand Down Expand Up @@ -1571,6 +1573,10 @@ export default {
}
}

if (['cancelMaintenance'].includes(action.api) && (params.rebalance === undefined || params.rebalance === null || params.rebalance === '')) {
params.rebalance = true
}

for (const key in values) {
const input = values[key]
for (const param of action.params) {
Expand Down
Loading