Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP1:Update
pacemaker.29834
bsc#1210074-0003-Fix-fencer-per-operation-fenci...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File bsc#1210074-0003-Fix-fencer-per-operation-fencing-timeout-takes-any-r.patch of Package pacemaker.29834
From 86de9621e22be1ce1a01eca1ce0b4e437766c18c Mon Sep 17 00:00:00 2001 From: "Gao,Yan" <ygao@suse.com> Date: Wed, 12 Apr 2023 11:12:34 +0200 Subject: [PATCH 03/11] Fix: fencer: per-operation fencing timeout takes any requested fencing delay into account ... to prevent it from eating up the timeout. Fixes T93 Fixes CLBZ#5493 --- cts/cts-fencing.in | 2 +- daemons/fenced/fenced_remote.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) Index: pacemaker-2.0.1+20190417.13d370ca9/daemons/fenced/fenced_remote.c =================================================================== --- pacemaker-2.0.1+20190417.13d370ca9.orig/daemons/fenced/fenced_remote.c +++ pacemaker-2.0.1+20190417.13d370ca9/daemons/fenced/fenced_remote.c @@ -1494,7 +1494,11 @@ call_remote_stonith(remote_fencing_op_t } if (peer) { - int timeout_one = 0; + /* Take any requested fencing delay into account to prevent it from eating + * up the timeout. + */ + int timeout_one = (op->delay > 0 ? + TIMEOUT_MULTIPLY_FACTOR * op->delay : 0); xmlNode *remote_op = stonith_create_op(op->client_callid, op->id, STONITH_OP_FENCE, NULL, 0); crm_xml_add(remote_op, F_STONITH_REMOTE_OP_ID, op->id); @@ -1508,15 +1512,15 @@ call_remote_stonith(remote_fencing_op_t crm_xml_add_int(remote_op, F_STONITH_DELAY, op->delay); if (device) { - timeout_one = TIMEOUT_MULTIPLY_FACTOR * - get_device_timeout(op, peer, device); + timeout_one += TIMEOUT_MULTIPLY_FACTOR * + get_device_timeout(op, peer, device); crm_info("Requesting that '%s' perform op '%s %s' with '%s' for %s (%ds)", peer->host, op->target, op->action, device, op->client_name, timeout_one); crm_xml_add(remote_op, F_STONITH_DEVICE, device); crm_xml_add(remote_op, F_STONITH_MODE, "slave"); } else { - timeout_one = TIMEOUT_MULTIPLY_FACTOR * get_peer_timeout(op, peer); + timeout_one += TIMEOUT_MULTIPLY_FACTOR * get_peer_timeout(op, peer); crm_info("Requesting that '%s' perform op '%s %s' for %s (%ds, %lds)", peer->host, op->target, op->action, op->client_name, timeout_one, stonith_watchdog_timeout_ms); crm_xml_add(remote_op, F_STONITH_MODE, "smart");
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor