• 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

Revisionb68267dad625d6cbab5f8b893e6dab7681b61a53 (tree)
Time2010-03-30 22:05:54
AuthorAndrew Beekhof <andrew@beek...>
CommiterAndrew Beekhof

Log Message

High: crmd: Do not ignore action timeouts based on FSA state

Change Summary

Incremental Difference

diff -r 81f6027f597e -r b68267dad625 crmd/te_callbacks.c
--- a/crmd/te_callbacks.c Tue Mar 30 13:59:45 2010 +0200
+++ b/crmd/te_callbacks.c Tue Mar 30 15:05:54 2010 +0200
@@ -464,12 +464,12 @@
464464 } else if(timer->reason == timeout_action_warn) {
465465 print_action(
466466 LOG_WARNING,"Action missed its timeout: ", timer->action);
467-
468- } else if(fsa_state != S_TRANSITION_ENGINE && fsa_state != S_POLICY_ENGINE) {
469- crm_err("Discarding action timeout in state: %s", fsa_state2string(fsa_state));
470-
471- } else if(transition_graph->complete) {
472- crm_err("Ignoring action timeout while not in transition");
467+
468+ /* Don't check the FSA state
469+ *
470+ * We might also be in S_INTEGRATION or some other state waiting for this
471+ * action so we can close the transition and continue
472+ */
473473
474474 } else {
475475 /* fail the action */
Show on old repository browser