[Debian-ha-commits] [ocfs2-tools] 55/58: Update sysfs filename for heartbeat dead threshold

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch upstream
in repository ocfs2-tools.

commit c229259ae807e910de0aff1354d768e65b8ddb61
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Fri Mar 24 20:19:54 2017 +0100

    Update sysfs filename for heartbeat dead threshold
    
    This was changed in the kernel a while ago so the heartbeat
    config currently looks like this (kernel 4.9.13):
    
    $ ls -l /sys/kernel/config/cluster/ocfs2/heartbeat
    drwxr-xr-x 2 root root    0 Mar 24 18:53 00831BDF77A04E4EBB619359FE5A4CAA
    -rw-r--r-- 1 root root 4096 Mar 24 19:19 mode
    -rw-r--r-- 1 root root 4096 Mar 24 19:19 threshold
---
 o2monitor/o2hbmonitor.c    | 2 +-
 vendor/common/o2cb.init.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/o2monitor/o2hbmonitor.c b/o2monitor/o2hbmonitor.c
index 94092a1..ea40793 100644
--- 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"
diff --git a/vendor/common/o2cb.init.sh b/vendor/common/o2cb.init.sh
index 5e85906..75b5f8c 100755
--- a/vendor/common/o2cb.init.sh
+++ b/vendor/common/o2cb.init.sh
@@ -235,7 +235,7 @@ read_timeout()
 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 @@ show_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 [ -f "$O2CB_HEARTBEAT_THRESHOLD_FILE" ]; then
         VAL=`cat "$O2CB_HEARTBEAT_THRESHOLD_FILE"`
         echo "  Heartbeat dead threshold: ${VAL}"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/ocfs2-tools.git