Skip to content

Merge branch '4.6-pre-migration-staging' into crmsh-4.6 #1787

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.

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

Open
wants to merge 34 commits into
base: crmsh-4.6
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
e0a03a6
Dev: ui_cluster: add 'crm cluster health sles [--fix]' (jsc#PED-8252)
nicholasyang2022 Oct 23, 2024
cfb68f6
Dev: pre-migration: preserve only checks for SLES 16 (jsc#PED-8252)
nicholasyang2022 Dec 10, 2024
61a559a
Dev: migration: run checks on remote nodes (jsc#PED-8252)
nicholasyang2022 Nov 1, 2024
775f992
backport to python 3.6
nicholasyang2022 Dec 13, 2024
1b261cd
Dev: pre-migration: add checks for used corosync features (jsc#PED-11…
nicholasyang2022 Dec 13, 2024
439c3ec
Dev: pre-migration: add service status checks (jsc#PED-11808)
nicholasyang2022 Dec 13, 2024
e261a2a
Dev: pre-migration: add checks for package version (jsc#PED-11808)
nicholasyang2022 Dec 13, 2024
5e19da1
Dev: pre-migration: check SAPHanaSR Classic resource agents (jsc#PED-…
nicholasyang2022 Dec 31, 2024
05a19e7
Dev: pre-migration: check removed resource agents (jsc#PED-11808)
nicholasyang2022 Dec 31, 2024
4aae98e
Dev: pre-migration: check removed fence agents (jsc#PED-11808)
nicholasyang2022 Dec 31, 2024
3254a02
Dev: pre-migration: check if ocfs2 is used (jsc#PED-11808)
nicholasyang2022 Jan 1, 2025
f16085b
Dev: add pre-migration checks for pacemaker version (jsc#PED-11808)
nicholasyang2022 Jan 2, 2025
4223180
Dev: pre-migration: better PASS/FAIL messages (jsc#PED-11808)
nicholasyang2022 Jan 6, 2025
4f51c67
Dev: pre-migration: do not colorize hostname header (jsc#PED-11808)
nicholasyang2022 Jan 6, 2025
22ca0de
Dev: pre-migration: add completer for 'crm cluster health sles16' (js…
nicholasyang2022 Jan 6, 2025
aeb8840
Fix: ui_cluster: fix do_health usage output
nicholasyang2022 Jan 6, 2025
f67a269
Dev: pre-migration: add message about removing stonith:external/sbd (…
nicholasyang2022 Jan 7, 2025
c4abee0
Dev: pre-migration: refine the message for stopped cluster services (…
nicholasyang2022 Jan 7, 2025
fd6eeca
Doc: ui_cluster: add document for `crm cluster health hawk2|sles16`
nicholasyang2022 Jan 7, 2025
5b1c64c
Fix: cibquery: grouped primitives is missing from query results (jsc#…
nicholasyang2022 Jan 9, 2025
8ad46e2
Dev: behave: add functional tests for pre-migration checks (jsc#PED-1…
nicholasyang2022 Jan 10, 2025
9851219
Refactor: cibquery: has_primitive_filesystem_ocfs2 to has_primitive_f…
nicholasyang2022 Jan 13, 2025
0e0bc57
Dev: pre-migration: add summary section to output (jsc#PED-11808)
nicholasyang2022 Jan 13, 2025
ba32a92
Dev: migration: refine message wording (jsc#PED-11808)
nicholasyang2022 Jan 16, 2025
bffa88e
Dev: report: Collect pre-migration check info in crm report result
liangxin1300 Jan 17, 2025
e9e1447
Dev: pre-migration: report "cannot migrate" if using external_sbd (js…
nicholasyang2022 Feb 28, 2025
59333a9
Fix: update the number of codecov report
nicholasyang2022 Feb 28, 2025
7c24d3b
Dev: pre-migration: use a unsupported list instead of supported list …
nicholasyang2022 Mar 18, 2025
be1ccc7
Fix: doc: fix a minor syntax error
nicholasyang2022 Mar 19, 2025
c389a21
Dev: pre-migration: check lsb or service resource agents (jsc#PED-11808)
nicholasyang2022 Mar 19, 2025
22d3e27
Dev: pre-migration: update the unsupported list
nicholasyang2022 Mar 20, 2025
f9bc7b7
Dev: pre-migration: add checks for deprecated resource agents (jsc#PE…
nicholasyang2022 Mar 20, 2025
b0602be
minor refactors
nicholasyang2022 Mar 20, 2025
e5e2a1e
Dev: migration: refine the message about deprecating udpu/udp in favo…
nicholasyang2022 May 7, 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
15 changes: 15 additions & 0 deletions .github/workflows/crmsh-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,21 @@ jobs:
token: ${{ secrets.CODECOV_TOKEN }}
flags: integration

functional_test_migration:
runs-on: ubuntu-24.04
timeout-minutes: 40
steps:
- uses: actions/checkout@v4
- name: functional test for migration
run: |
echo '{ "exec-opts": ["native.cgroupdriver=systemd"] }' | sudo tee /etc/docker/daemon.json
sudo systemctl restart docker.service
$DOCKER_SCRIPT `$GET_INDEX_OF migration` && $DOCKER_SCRIPT -d && $DOCKER_SCRIPT -u `$GET_INDEX_OF migration`
- uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: integration

original_regression_test:
runs-on: ubuntu-24.04
timeout-minutes: 40
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
recursive-include crmsh *.txt
4 changes: 2 additions & 2 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ coverage:
threshold: 0.35%
codecov:
notify:
after_n_builds: 28
after_n_builds: 29
comment:
after_n_builds: 28
after_n_builds: 29
layout: "condensed_header, flags, files, condensed_footer"

ignore:
Expand Down
25 changes: 25 additions & 0 deletions crmsh/cibquery.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
"""utilities for parsing CIB xml"""
import collections
import typing

import lxml.etree


ResourceAgent = collections.namedtuple('ResourceAgentDO', ['m_class', 'm_provider', 'm_type'])
# class: str
# provider: Optional[str]
# type: str


def get_configured_resource_agents(cib: lxml.etree.Element) -> typing.Set[ResourceAgent]:
return set(
ResourceAgent(e.get('class'), e.get('provider'), e.get('type'))
for e in cib.xpath('/cib/configuration/resources//primitive')
)


def has_primitive_filesystem_with_fstype(cib: lxml.etree.Element, fstype: str) -> bool:
return bool(cib.xpath(
'/cib/configuration/resources//primitive[@class="ocf" and @provider="heartbeat" and @type="Filesystem"]'
f'/instance_attributes/nvpair[@name="fstype" and @value="{fstype}"]'
))
70 changes: 70 additions & 0 deletions crmsh/migration-unsupported-resource-agents.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
ocf:heartbeat:AoEtarget
ocf:heartbeat:AudibleAlarm
ocf:heartbeat:EvmsSCC
ocf:heartbeat:Evmsd
ocf:heartbeat:ICP
ocf:heartbeat:IPaddr,ocf:heartbeat:IPaddr2
ocf:heartbeat:IPv6addr,ocf:heartbeat:IPaddr2
ocf:heartbeat:LVM,ocf:heartbeat:LVM-activate,deprecated
ocf:heartbeat:LinuxSCSI
ocf:heartbeat:ManageRAID
ocf:heartbeat:ManageVE
ocf:heartbeat:Pure-FTPd
ocf:heartbeat:Raid1,ocf:heartbeat:mdraid,deprecated
ocf:heartbeat:ServeRAID
ocf:heartbeat:SphinxSearchDaemon
ocf:heartbeat:SysInfo
ocf:heartbeat:VIPArip
ocf:heartbeat:WinPopup
ocf:heartbeat:Xen
ocf:heartbeat:asterisk
ocf:heartbeat:clvm
ocf:heartbeat:conntrackd
ocf:heartbeat:dnsupdate
ocf:heartbeat:dovecot
ocf:heartbeat:eDir88
ocf:heartbeat:fio
ocf:heartbeat:gcp-vpc-move-route
ocf:heartbeat:ids
ocf:heartbeat:ipsec
ocf:heartbeat:iscsi
ocf:heartbeat:jboss
ocf:heartbeat:jira
ocf:heartbeat:kamailio
ocf:heartbeat:lxc
ocf:heartbeat:minio
ocf:heartbeat:nagios
ocf:heartbeat:ocivip
ocf:heartbeat:openstack-cinder-volume
ocf:heartbeat:openstack-floating-ip
ocf:heartbeat:openstack-info
ocf:heartbeat:openstack-virtual-ip
ocf:heartbeat:lxd-info
ocf:heartbeat:machine-info
ocf:heartbeat:pingd,ocf:pacemaker:ping
ocf:heartbeat:pound
ocf:heartbeat:proftpd
ocf:heartbeat:rkt
ocf:heartbeat:rsyslog
ocf:heartbeat:scsi2reservation
ocf:heartbeat:smb-share
ocf:heartbeat:sybaseASE
ocf:heartbeat:syslog-ng
ocf:heartbeat:varnish
ocf:heartbeat:vdo-vol
ocf:heartbeat:vmware
ocf:heartbeat:vsftpd
ocf:heartbeat:zabbixserver
ocf:pacemaker:o2cb
stonith:fence_amt
stonith:fence_compute
stonith:fence_docker
stonith:fence_evacuate
stonith:fence_ldom
stonith:fence_legacy
stonith:fence_openstack
stonith:fence_powerman
stonith:fence_rhevm
stonith:fence_xenapi
stonith:fence_zvm
stonith:external/sbd,stonith:fence_sbd
Loading