Skip to content
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

Change default DLM RA name #1696

Merged
merged 2 commits into from
Mar 3, 2025
Merged

Change default DLM RA name #1696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8e97e2
Dev: cluster_fs: Use 'dlm-controld-ra' as the default dlm ra name
liangxin1300 Feb 28, 2025
fa52cf9
Dev: behave: Sync dlm ra name in ocfs2 and gfs2 test cases
liangxin1300 Feb 28, 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
2 changes: 1 addition & 1 deletion crmsh/cluster_fs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def __init__(self, context):
# Consider such issue might not be fixed in the local pacemaker version
# https://github.com/ClusterLabs/pacemaker/pull/3766
# DLM RA's id shouldn avoid using 'gfs' as prefix
self.DLM_RA_ID = "dlm"
self.DLM_RA_ID = "dlm-controld-ra"
self.FS_RA_ID = f"{prefix}-clusterfs"
self.LVMLOCKD_RA_ID = f"{prefix}-lvmlockd"
self.LVMACTIVATE_RA_ID = f"{prefix}-lvmactivate"
Expand Down
8 changes: 4 additions & 4 deletions test/features/gfs2.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Scenario: Configure gfs2 along with init process
Then Cluster service is "started" on "hanode1"
And Service "sbd" is "started" on "hanode1"
And Resource "stonith-sbd" type "fence_sbd" is "Started"
And Resource "dlm" type "pacemaker:controld" is "Started"
And Resource "dlm-controld-ra" type "pacemaker:controld" is "Started"
And Resource "gfs2-clusterfs" type "heartbeat:Filesystem" is "Started"

@clean
Expand All @@ -37,7 +37,7 @@ Scenario: Configure cluster lvm2 + gfs2 with init process
Then Cluster service is "started" on "hanode1"
And Service "sbd" is "started" on "hanode1"
And Resource "stonith-sbd" type "fence_sbd" is "Started"
And Resource "dlm" type "pacemaker:controld" is "Started"
And Resource "dlm-controld-ra" type "pacemaker:controld" is "Started"
And Resource "gfs2-lvmlockd" type "heartbeat:lvmlockd" is "Started"
And Resource "gfs2-lvmactivate" type "heartbeat:LVM-activate" is "Started"
And Resource "gfs2-clusterfs" type "heartbeat:Filesystem" is "Started"
Expand All @@ -55,7 +55,7 @@ Scenario: Add gfs2 alone on a running cluster
And Service "sbd" is "started" on "hanode2"
And Resource "stonith-sbd" type "fence_sbd" is "Started"
When Run "crm cluster init gfs2 -g /dev/sda2 -y" on "hanode1"
Then Resource "dlm" type "pacemaker:controld" is "Started"
Then Resource "dlm-controld-ra" type "pacemaker:controld" is "Started"
And Resource "gfs2-clusterfs" type "heartbeat:Filesystem" is "Started"

@clean
Expand All @@ -71,7 +71,7 @@ Scenario: Add cluster lvm2 + gfs2 on a running cluster
And Service "sbd" is "started" on "hanode2"
And Resource "stonith-sbd" type "fence_sbd" is "Started"
When Run "crm cluster init gfs2 -g /dev/sda2 -C -y" on "hanode1"
Then Resource "dlm" type "pacemaker:controld" is "Started"
Then Resource "dlm-controld-ra" type "pacemaker:controld" is "Started"
And Resource "gfs2-lvmlockd" type "heartbeat:lvmlockd" is "Started"
And Resource "gfs2-lvmactivate" type "heartbeat:LVM-activate" is "Started"
And Resource "gfs2-clusterfs" type "heartbeat:Filesystem" is "Started"
8 changes: 4 additions & 4 deletions test/features/ocfs2.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Scenario: Configure ocfs2 along with init process
Then Cluster service is "started" on "hanode1"
And Service "sbd" is "started" on "hanode1"
And Resource "stonith-sbd" type "fence_sbd" is "Started"
And Resource "ocfs2-dlm" type "pacemaker:controld" is "Started"
And Resource "dlm-controld-ra" type "pacemaker:controld" is "Started"
And Resource "ocfs2-clusterfs" type "heartbeat:Filesystem" is "Started"

@clean
Expand All @@ -21,7 +21,7 @@ Scenario: Configure cluster lvm2 + ocfs2 with init process
Then Cluster service is "started" on "hanode1"
And Service "sbd" is "started" on "hanode1"
And Resource "stonith-sbd" type "fence_sbd" is "Started"
And Resource "ocfs2-dlm" type "pacemaker:controld" is "Started"
And Resource "dlm-controld-ra" type "pacemaker:controld" is "Started"
And Resource "ocfs2-lvmlockd" type "heartbeat:lvmlockd" is "Started"
And Resource "ocfs2-lvmactivate" type "heartbeat:LVM-activate" is "Started"
And Resource "ocfs2-clusterfs" type "heartbeat:Filesystem" is "Started"
Expand All @@ -39,7 +39,7 @@ Scenario: Add ocfs2 alone on a running cluster
And Service "sbd" is "started" on "hanode2"
And Resource "stonith-sbd" type "fence_sbd" is "Started"
When Run "crm cluster init ocfs2 -o /dev/sda2 -y" on "hanode1"
Then Resource "ocfs2-dlm" type "pacemaker:controld" is "Started"
Then Resource "dlm-controld-ra" type "pacemaker:controld" is "Started"
And Resource "ocfs2-clusterfs" type "heartbeat:Filesystem" is "Started"

@clean
Expand All @@ -55,7 +55,7 @@ Scenario: Add cluster lvm2 + ocfs2 on a running cluster
And Service "sbd" is "started" on "hanode2"
And Resource "stonith-sbd" type "fence_sbd" is "Started"
When Run "crm cluster init ocfs2 -o /dev/sda2 -C -y" on "hanode1"
Then Resource "ocfs2-dlm" type "pacemaker:controld" is "Started"
Then Resource "dlm-controld-ra" type "pacemaker:controld" is "Started"
And Resource "ocfs2-lvmlockd" type "heartbeat:lvmlockd" is "Started"
And Resource "ocfs2-lvmactivate" type "heartbeat:LVM-activate" is "Started"
And Resource "ocfs2-clusterfs" type "heartbeat:Filesystem" is "Started"