|
 |
c54a00 |
From b3d9a6e313cb77ef0b22aa0a182f0cabbaa2a70e Mon Sep 17 00:00:00 2001
|
|
|
c54a00 |
From: Klaus Wenninger <klaus.wenninger@aon.at>
|
|
|
c54a00 |
Date: Wed, 22 May 2019 16:34:58 +0200
|
|
|
c54a00 |
Subject: [PATCH] Fix: fence-lib: regression introduced with fork callback
|
|
|
c54a00 |
|
|
|
c54a00 |
If it is a retry device is already moved from activating_on to
|
|
|
c54a00 |
active_on.
|
|
|
c54a00 |
---
|
|
|
c54a00 |
fencing/commands.c | 7 ++++++-
|
|
|
c54a00 |
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
c54a00 |
|
|
|
c54a00 |
diff --git a/fencing/commands.c b/fencing/commands.c
|
|
|
c54a00 |
index d47a5ea..264697e 100644
|
|
|
c54a00 |
--- a/fencing/commands.c
|
|
|
c54a00 |
+++ b/fencing/commands.c
|
|
|
c54a00 |
@@ -306,8 +306,13 @@ static void
|
|
|
c54a00 |
fork_cb(GPid pid, gpointer user_data)
|
|
|
c54a00 |
{
|
|
|
c54a00 |
async_command_t *cmd = (async_command_t *) user_data;
|
|
|
c54a00 |
- stonith_device_t * device = cmd->activating_on;
|
|
|
c54a00 |
+ stonith_device_t * device =
|
|
|
c54a00 |
+ /* in case of a retry we've done the move from
|
|
|
c54a00 |
+ * activating_on to active_on already
|
|
|
c54a00 |
+ */
|
|
|
c54a00 |
+ cmd->activating_on?cmd->activating_on:cmd->active_on;
|
|
|
c54a00 |
|
|
|
c54a00 |
+ CRM_ASSERT(device);
|
|
|
c54a00 |
crm_debug("Operation %s%s%s on %s now running with pid=%d, timeout=%ds",
|
|
|
c54a00 |
cmd->action, cmd->victim ? " for node " : "", cmd->victim ? cmd->victim : "",
|
|
|
c54a00 |
device->id, pid, cmd->timeout);
|
|
|
c54a00 |
--
|
|
|
c54a00 |
1.8.3.1
|
|
|
c54a00 |
|