1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
Description: Update sysfs filename for heartbeat dead threshold
Author: Michal Svamberg <svamberg@civ.zcu.cz>
Bug: https://github.com/markfasheh/ocfs2-tools/pull/9
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858623
Reviewed-by: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Last-Update: 2017-03-27
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/o2monitor/o2hbmonitor.c
+++ b/o2monitor/o2hbmonitor.c
@@ -49,7 +49,7 @@
#define SYS_CONFIG_DIR "/sys/kernel/config"
#define O2HB_CLUSTER_DIR SYS_CONFIG_DIR"/cluster"
#define O2HB_HEARTBEAT_DIR O2HB_CLUSTER_DIR"/%s/heartbeat"
-#define O2HB_DEAD_THRESHOLD O2HB_HEARTBEAT_DIR"/dead_threshold"
+#define O2HB_DEAD_THRESHOLD O2HB_HEARTBEAT_DIR"/threshold"
#define O2HB_DEVICE O2HB_HEARTBEAT_DIR"/%s/dev"
#define SYS_DEBUG_DIR "/sys/kernel/debug"
--- a/vendor/common/o2cb.init.sh
+++ b/vendor/common/o2cb.init.sh
@@ -235,7 +235,7 @@
set_timeouts_o2cb()
{
O2CB_HEARTBEAT_THRESHOLD_FILE_OLD=/proc/fs/ocfs2_nodemanager/hb_dead_threshold
- O2CB_HEARTBEAT_THRESHOLD_FILE=$(configfs_path)/cluster/${CLUSTER}/heartbeat/dead_threshold
+ O2CB_HEARTBEAT_THRESHOLD_FILE=$(configfs_path)/cluster/${CLUSTER}/heartbeat/threshold
if [ -n "$O2CB_HEARTBEAT_THRESHOLD" ]; then
if [ -f "$O2CB_HEARTBEAT_THRESHOLD_FILE" ]; then
echo "$O2CB_HEARTBEAT_THRESHOLD" > "$O2CB_HEARTBEAT_THRESHOLD_FILE"
@@ -270,7 +270,7 @@
{
O2CB_HEARTBEAT_THRESHOLD_FILE_OLD=/proc/fs/ocfs2_nodemanager/hb_dead_threshold
- O2CB_HEARTBEAT_THRESHOLD_FILE=$(configfs_path)/cluster/${CLUSTER}/heartbeat/dead_threshold
+ O2CB_HEARTBEAT_THRESHOLD_FILE=$(configfs_path)/cluster/${CLUSTER}/heartbeat/threshold
if [ -f "$O2CB_HEARTBEAT_THRESHOLD_FILE" ]; then
VAL=`cat "$O2CB_HEARTBEAT_THRESHOLD_FILE"`
echo " Heartbeat dead threshold: ${VAL}"
|
