[Debian-ha-commits] [ocfs2-tools] 57/58: Revert "Update sysfs filename for heartbeat dead threshold"
Valentin Vidic
vvidic-guest at moszumanska.debian.org
Tue Jun 20 13:40:45 UTC 2017
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 13a9dbe829f7787665013eeb4bc08c913488416e
Author: Junxiao Bi <junxiao.bi at oracle.com>
Date: Mon Mar 27 09:47:51 2017 +0800
Revert "Update sysfs filename for heartbeat dead 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 ea40793..94092a1 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"/threshold"
+#define O2HB_DEAD_THRESHOLD O2HB_HEARTBEAT_DIR"/dead_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 75b5f8c..5e85906 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/threshold
+ O2CB_HEARTBEAT_THRESHOLD_FILE=$(configfs_path)/cluster/${CLUSTER}/heartbeat/dead_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/threshold
+ O2CB_HEARTBEAT_THRESHOLD_FILE=$(configfs_path)/cluster/${CLUSTER}/heartbeat/dead_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
More information about the Debian-HA-Commits
mailing list