• R/O
  • SSH

pm_diskd: Commit

※ リポジトリは、pm-diskd ブランチが https://github.com/linux-ha-japan/pm_diskd-1.0 へ、pm-diskd-2.0ブランチが https://github.com/linux-ha-japan/pm_diskd へ移行しました。

Pacemaker 対応ディスク故障監視機能。

Pacemaker-1.0公式リポジトリのクローンに対し、パッチ作成用のブランチを作成して管理する。
ブランチ名: pm-diskd

初回 hg clone 実行後は、hg update -r pm-diskd を実行すること。

Heartbeat-2.1.4 用 hb-diskd(*) のPacemaker対応版
(*) http://sourceforge.jp/projects/linux-ha/releases/?package_id=10555


Commit MetaInfo

Revision0a7aa6ca729bd62e2e399a7468d2b100e24c2636 (tree)
Time2010-03-26 23:10:39
AuthorAndrew Beekhof <andrew@beek...>
CommiterAndrew Beekhof

Log Message

High: crmd: Ensure we dont get stuck in S_PENDING if we loose an election to someone that never talks to us again

Change Summary

Incremental Difference

diff -r 796a4e11dabc -r 0a7aa6ca729b crmd/fsa_defines.h
--- a/crmd/fsa_defines.h Thu Mar 25 22:58:18 2010 +0100
+++ b/crmd/fsa_defines.h Fri Mar 26 15:10:39 2010 +0100
@@ -393,7 +393,7 @@
393393 #define O_PE_RESTART (A_PE_START|A_PE_STOP)
394394 #define O_TE_RESTART (A_TE_START|A_TE_STOP)
395395 #define O_CIB_RESTART (A_CIB_START|A_CIB_STOP)
396-
396+#define O_DC_TIMER_RESTART (A_DC_TIMER_STOP|A_DC_TIMER_START)
397397 /*======================================
398398 *
399399 * "register" contents
diff -r 796a4e11dabc -r 0a7aa6ca729b crmd/fsa_matrix.h
--- a/crmd/fsa_matrix.h Thu Mar 25 22:58:18 2010 +0100
+++ b/crmd/fsa_matrix.h Fri Mar 26 15:10:39 2010 +0100
@@ -1189,21 +1189,22 @@
11891189 /* S_HALT ==> */ A_WARN,
11901190 },
11911191
1192+/* For everyone ending up in S_PENDING, (re)start the DC timer and wait for I_JOIN_OFFER or I_NOT_DC */
11921193 /* Got an I_PENDING */
11931194 {
1194- /* S_IDLE ==> */ O_RELEASE,
1195- /* S_ELECTION ==> */ O_RELEASE|A_DC_TIMER_STOP,
1196- /* S_INTEGRATION ==> */ O_RELEASE,
1197- /* S_FINALIZE_JOIN ==> */ O_RELEASE,
1198- /* S_NOT_DC ==> */ A_LOG,
1199- /* S_POLICY_ENGINE ==> */ O_RELEASE,
1195+ /* S_IDLE ==> */ O_RELEASE|O_DC_TIMER_RESTART,
1196+ /* S_ELECTION ==> */ O_RELEASE|O_DC_TIMER_RESTART,
1197+ /* S_INTEGRATION ==> */ O_RELEASE|O_DC_TIMER_RESTART,
1198+ /* S_FINALIZE_JOIN ==> */ O_RELEASE|O_DC_TIMER_RESTART,
1199+ /* S_NOT_DC ==> */ A_LOG|O_DC_TIMER_RESTART,
1200+ /* S_POLICY_ENGINE ==> */ O_RELEASE|O_DC_TIMER_RESTART,
12001201 /* S_RECOVERY ==> */ A_WARN,
1201- /* S_RELEASE_DC ==> */ A_WARN,
1202+ /* S_RELEASE_DC ==> */ A_WARN|O_DC_TIMER_RESTART,
12021203 /* S_STARTING ==> */ A_LOG|A_DC_TIMER_START|A_CL_JOIN_QUERY,
1203- /* S_PENDING ==> */ A_LOG,
1204+ /* S_PENDING ==> */ A_LOG|O_DC_TIMER_RESTART,
12041205 /* S_STOPPING ==> */ A_WARN,
12051206 /* S_TERMINATE ==> */ A_WARN,
1206- /* S_TRANSITION_ENGINE ==> */ O_RELEASE,
1207+ /* S_TRANSITION_ENGINE ==> */ O_RELEASE|O_DC_TIMER_RESTART,
12071208 /* S_HALT ==> */ A_WARN,
12081209 },
12091210
Show on old repository browser