File 0001-Fix-tools-crm_shadow-commit-now-works-with... of Package pacemaker.34780

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-tools-crm_shadow-commit-now-works-with-CIB_file.patch of Package pacemaker.34780

From 5c159d11e7069c0865d9c6940319a6a8942e2741 Mon Sep 17 00:00:00 2001
From: Reid Wahl <nrwahl@protonmail.com>
Date: Thu, 2 Mar 2023 14:17:26 -0800
Subject: [PATCH] Fix: tools: crm_shadow --commit now works with CIB_file

Previously, when the CIB_file environment variable was set and
`crm_shadow --commit --force` was called, the changes from the shadow
file weren't written to the CIB_file. The changes were made only in
memory.

This commit fixes the issue by calling cib_delete(), which writes out
any changes via cib_file_signoff().

Closes T633

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
---
 cts/cli/regression.tools.exp | 13 +++----------
 tools/crm_shadow.c           |  2 ++
 2 files changed, 5 insertions(+), 10 deletions(-)

Index: pacemaker-2.1.5+20221208.a3f44794f/tools/crm_shadow.c
===================================================================
--- pacemaker-2.1.5+20221208.a3f44794f.orig/tools/crm_shadow.c
+++ pacemaker-2.1.5+20221208.a3f44794f/tools/crm_shadow.c
@@ -555,6 +555,8 @@ main(int argc, char **argv)
     }
   done:
     free(shadow_file);
+    cib_delete(real_cib);
+
     free(shadow);
     crm_exit(exit_code);
 }

Places

File 0001-Fix-tools-crm_shadow-commit-now-works-with-CIB_file.patch of Package pacemaker.34780

Places