Compare commits

...

No commits in common. "c8" and "c8s" have entirely different histories.
c8 ... c8s

120 changed files with 175 additions and 25 deletions

19
.gitignore vendored
View File

@ -1,12 +1,7 @@
SOURCES/ClusterLabs-resource-agents-55a4e2c9.tar.gz /*.tar.gz
SOURCES/aliyun-cli-2.1.10.tar.gz /*.rpm
SOURCES/aliyun-python-sdk-core-2.13.1.tar.gz /*.whl
SOURCES/aliyun-python-sdk-ecs-4.9.3.tar.gz /.*
SOURCES/aliyun-python-sdk-vpc-3.0.2.tar.gz /*/
SOURCES/colorama-0.3.3.tar.gz !/tests/
SOURCES/google-cloud-sdk-360.0.0-linux-x86_64.tar.gz /tests/*.retry
SOURCES/httplib2-0.20.4.tar.gz
SOURCES/pycryptodome-3.20.0.tar.gz
SOURCES/pyparsing-2.4.7-py2.py3-none-any.whl
SOURCES/pyroute2-0.4.13.tar.gz
SOURCES/urllib3-1.26.18.tar.gz

View File

@ -1,12 +0,0 @@
dfc65f4cac3f95026b2f5674019814a527333004 SOURCES/ClusterLabs-resource-agents-55a4e2c9.tar.gz
306e131d8908ca794276bfe3a0b55ccc3bbd482f SOURCES/aliyun-cli-2.1.10.tar.gz
0a56f6d9ed2014a363486d33b63eca094379be06 SOURCES/aliyun-python-sdk-core-2.13.1.tar.gz
c2a98b9a1562d223a76514f05028488ca000c395 SOURCES/aliyun-python-sdk-ecs-4.9.3.tar.gz
f14647a4d37a9a254c4e711b95a7654fc418e41e SOURCES/aliyun-python-sdk-vpc-3.0.2.tar.gz
0fe5bd8bca54dd71223778a1e0bcca9af324abb1 SOURCES/colorama-0.3.3.tar.gz
81f039cf075e9c8b70d5af99c189296a9e031de3 SOURCES/google-cloud-sdk-360.0.0-linux-x86_64.tar.gz
7caf4412d9473bf17352316249a8133fa70b7e37 SOURCES/httplib2-0.20.4.tar.gz
c55d177e9484d974c95078d4ae945f89ba2c7251 SOURCES/pycryptodome-3.20.0.tar.gz
c8307f47e3b75a2d02af72982a2dfefa3f56e407 SOURCES/pyparsing-2.4.7-py2.py3-none-any.whl
147149db11104c06d405fd077dcd2aa1c345f109 SOURCES/pyroute2-0.4.13.tar.gz
84e2852d8da1655373f7ce5e7d5d3e256b62b4e4 SOURCES/urllib3-1.26.18.tar.gz

View File

@ -0,0 +1,33 @@
From f671a00108d0b272493b4b4a0a5fb838e5eca2af Mon Sep 17 00:00:00 2001
From: Silvan Raijer <s.raijer@rayzilt.nl>
Date: Wed, 27 May 2026 11:10:19 +0200
Subject: [PATCH] nfsserver: Stop fsidd when stopping nfs-server
Signed-off-by: Silvan Raijer <s.raijer@rayzilt.nl>
---
heartbeat/nfsserver | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver
index fe15abc06..f41ef92c0 100755
--- a/heartbeat/nfsserver
+++ b/heartbeat/nfsserver
@@ -1010,6 +1010,18 @@ nfsserver_stop ()
return $OCF_ERR_GENERIC
fi
fi
+
+ nfs_exec stop fsidd > /dev/null 2>&1
+ ocf_log info "Stop: fsidd"
+ fn=`mktemp`
+ nfs_exec status fsidd > $fn 2>&1
+ rc=$?
+ ocf_log debug "$(cat $fn)"
+ rm -f $fn
+ if [ "$rc" -eq "0" ]; then
+ ocf_exit_reason "Failed to stop fsidd"
+ return $OCF_ERR_GENERIC
+ fi
esac

View File

@ -0,0 +1,43 @@
From ba7d5d59308458e1892fd29c9a719c8779dd46b6 Mon Sep 17 00:00:00 2001
From: Arslan Ahmad <arslan.ahmad97@googlemail.com>
Date: Tue, 2 Jun 2026 18:10:11 +0530
Subject: [PATCH] nfsserver: Fixes the incorrect indentation
Signed-off-by: Arslan Ahmad <arslan.ahmad97@googlemail.com>
---
heartbeat/nfsserver | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver
index f41ef92c0..93428bfd1 100755
--- a/heartbeat/nfsserver
+++ b/heartbeat/nfsserver
@@ -1011,17 +1011,17 @@ nfsserver_stop ()
fi
fi
- nfs_exec stop fsidd > /dev/null 2>&1
- ocf_log info "Stop: fsidd"
- fn=`mktemp`
- nfs_exec status fsidd > $fn 2>&1
- rc=$?
- ocf_log debug "$(cat $fn)"
- rm -f $fn
- if [ "$rc" -eq "0" ]; then
- ocf_exit_reason "Failed to stop fsidd"
- return $OCF_ERR_GENERIC
- fi
+ nfs_exec stop fsidd > /dev/null 2>&1
+ ocf_log info "Stop: fsidd"
+ fn=`mktemp`
+ nfs_exec status fsidd > $fn 2>&1
+ rc=$?
+ ocf_log debug "$(cat $fn)"
+ rm -f $fn
+ if [ "$rc" -eq "0" ]; then
+ ocf_exit_reason "Failed to stop fsidd"
+ return $OCF_ERR_GENERIC
+ fi
esac

Some files were not shown because too many files have changed in this diff Show More