From 756a3e522aa444b456e21128a52317226b346005 Mon Sep 17 00:00:00 2001

From: Ken Gaillot <kgaillot@redhat.com>

Date: Tue, 21 May 2019 15:26:20 -0500

Subject: [PATCH 01/11] Doc: libpacemaker: correct doxygen block for shutdown

 op creator

copy/paste error

---

 lib/pacemaker/pcmk_sched_utils.c | 5 +----

 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/pacemaker/pcmk_sched_utils.c b/lib/pacemaker/pcmk_sched_utils.c

index 5342e51..7b5cb7d 100644

--- a/lib/pacemaker/pcmk_sched_utils.c

+++ b/lib/pacemaker/pcmk_sched_utils.c

@@ -446,10 +446,7 @@ pe_cancel_op(pe_resource_t *rsc, const char *task, guint interval_ms,

  * \internal

  * \brief Create a shutdown op for a scheduler transition

  *

- * \param[in] rsc          Resource of action to cancel

- * \param[in] task         Name of action to cancel

- * \param[in] interval_ms  Interval of action to cancel

- * \param[in] node         Node of action to cancel

+ * \param[in] node         Node being shut down

  * \param[in] data_set     Working set of cluster

  *

  * \return Created op

-- 

1.8.3.1

From 5249dd9295307c0e22e223ea7d6f5f24a0a3fe25 Mon Sep 17 00:00:00 2001

From: Ken Gaillot <kgaillot@redhat.com>

Date: Fri, 24 May 2019 10:17:15 -0500

Subject: [PATCH 02/11] Refactor: libpe_status: rename target rc function

... in line with current naming standards, to avoid confusion with

controller function of the same name

---

 include/crm/pengine/internal.h | 2 +-

 lib/pengine/failcounts.c       | 4 ++--

 lib/pengine/unpack.c           | 4 ++--

 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/crm/pengine/internal.h b/include/crm/pengine/internal.h

index 6d22db7..fd55bb9 100644

--- a/include/crm/pengine/internal.h

+++ b/include/crm/pengine/internal.h

@@ -288,7 +288,7 @@ pe_base_name_eq(resource_t *rsc, const char *id)

     return FALSE;

 }

-int get_target_rc(xmlNode * xml_op);

+int pe__target_rc_from_xml(xmlNode *xml_op);

 gint sort_node_uname(gconstpointer a, gconstpointer b);

 bool is_set_recursive(resource_t * rsc, long long flag, bool any);

diff --git a/lib/pengine/failcounts.c b/lib/pengine/failcounts.c

index 8f01c07..0c8ca5d 100644

--- a/lib/pengine/failcounts.c

+++ b/lib/pengine/failcounts.c

@@ -1,5 +1,5 @@

 /*

- * Copyright 2008-2018 Andrew Beekhof <andrew@beekhof.net>

+ * Copyright 2008-2019 the Pacemaker project contributors

  *

  * This source code is licensed under the GNU Lesser General Public License

  * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.

@@ -62,7 +62,7 @@ is_matched_failure(const char *rsc_id, xmlNode *conf_op_xml,

         if (safe_str_eq(expected_op_key, lrm_op_id)) {

             int rc = 0;

-            int target_rc = get_target_rc(lrm_op_xml);

+            int target_rc = pe__target_rc_from_xml(lrm_op_xml);

             crm_element_value_int(lrm_op_xml, XML_LRM_ATTR_RC, &rc);

             if (rc != target_rc) {

diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c

index 02cef2c..0e8177b 100644

--- a/lib/pengine/unpack.c

+++ b/lib/pengine/unpack.c

@@ -3013,7 +3013,7 @@ static bool check_operation_expiry(resource_t *rsc, node_t *node, int rc, xmlNod

     return expired;

 }

-int get_target_rc(xmlNode *xml_op)

+int pe__target_rc_from_xml(xmlNode *xml_op)

 {

     int target_rc = 0;

     const char *key = crm_element_value(xml_op, XML_ATTR_TRANSITION_KEY);

@@ -3141,7 +3141,7 @@ unpack_rsc_op(resource_t * rsc, node_t * node, xmlNode * xml_op, xmlNode ** last

     int rc = 0;

     int status = PCMK_LRM_OP_UNKNOWN;

-    int target_rc = get_target_rc(xml_op);

+    int target_rc = pe__target_rc_from_xml(xml_op);

     guint interval_ms = 0;

     gboolean expired = FALSE;

-- 

1.8.3.1

From 2ccbefc2b623a2671f14824c6aea87c87fc338a0 Mon Sep 17 00:00:00 2001

From: Ken Gaillot <kgaillot@redhat.com>

Date: Fri, 24 May 2019 09:59:35 -0500

Subject: [PATCH 03/11] Refactor: libpacemaker: make transition.h internal

transition.h has always been installed even though it was purely internal.

Since libtransitioner is now merged into libpacemaker, move transition.h

to include/pcmki/pcmki_transition.h and make it internal.

Also, get rid of pcmki_sched_transition.h since it no longer contains

anything transition-related, and move its two function declarations to

pcmki_sched_utils.h.

---

 daemons/controld/controld_execd_state.c |   4 +-

 daemons/controld/controld_fencing.h     |   2 +-

 daemons/controld/controld_join_dc.c     |   4 +-

 daemons/controld/controld_transition.h  |   2 +-

 daemons/controld/controld_utils.h       |   7 +-

 include/crm/Makefile.am                 |   5 +-

 include/crm/transition.h                | 153 --------------------------------

 include/pacemaker-internal.h            |   2 +-

 include/pcmki/Makefile.am               |  12 +--

 include/pcmki/pcmki_sched_transition.h  |  22 -----

 include/pcmki/pcmki_sched_utils.h       |  16 ++++

 include/pcmki/pcmki_transition.h        | 143 +++++++++++++++++++++++++++++

 lib/pacemaker/pcmk_sched_transition.c   |   3 +-

 lib/pacemaker/pcmk_trans_graph.c        |  27 ++----

 lib/pacemaker/pcmk_trans_unpack.c       |  23 ++---

 lib/pacemaker/pcmk_trans_utils.c        |  27 ++----

 tools/crm_simulate.c                    |   1 -

 17 files changed, 201 insertions(+), 252 deletions(-)

 delete mode 100644 include/crm/transition.h

 delete mode 100644 include/pcmki/pcmki_sched_transition.h

 create mode 100644 include/pcmki/pcmki_transition.h

diff --git a/daemons/controld/controld_execd_state.c b/daemons/controld/controld_execd_state.c

index 8a1a7f3..4e9f096 100644

--- a/daemons/controld/controld_execd_state.c

+++ b/daemons/controld/controld_execd_state.c

@@ -1,5 +1,5 @@

 /*

- * Copyright 2012-2018 David Vossel <davidvossel@gmail.com>

+ * Copyright 2012-2019 the Pacemaker project contributors

  *

  * This source code is licensed under the GNU General Public License version 2

  * or later (GPLv2+) WITHOUT ANY WARRANTY.

@@ -10,6 +10,7 @@

 #include <crm/msg_xml.h>

 #include <crm/common/iso8601.h>

+#include <pacemaker-internal.h>

 #include <pacemaker-controld.h>

 #include <controld_fsa.h>

 #include <controld_messages.h>

@@ -18,7 +19,6 @@

 #include <controld_alerts.h>

 #include <crm/pengine/rules.h>

 #include <crm/pengine/rules_internal.h>

-#include <crm/transition.h>

 #include <crm/lrmd_alerts_internal.h>

 GHashTable *lrm_state_table = NULL;

diff --git a/daemons/controld/controld_fencing.h b/daemons/controld/controld_fencing.h

index 3ef537f..8f7f19b 100644

--- a/daemons/controld/controld_fencing.h

+++ b/daemons/controld/controld_fencing.h

@@ -11,7 +11,7 @@

 #  define CONTROLD_FENCING__H

 #include <stdbool.h>                // bool

-#include <crm/transition.h>         // crm_graph_t, crm_action_t

+#include <pacemaker-internal.h>     // crm_graph_t, crm_action_t

 // stonith fail counts

 void st_fail_count_reset(const char * target);

diff --git a/daemons/controld/controld_join_dc.c b/daemons/controld/controld_join_dc.c

index ddee895..d790d9a 100644

--- a/daemons/controld/controld_join_dc.c

+++ b/daemons/controld/controld_join_dc.c

@@ -1,5 +1,5 @@

 /*

- * Copyright 2004-2018 Andrew Beekhof <andrew@beekhof.net>

+ * Copyright 2004-2019 the Pacemaker project contributors

  *

  * This source code is licensed under the GNU General Public License version 2

  * or later (GPLv2+) WITHOUT ANY WARRANTY.

@@ -15,7 +15,7 @@

 #include <controld_fsa.h>

 #include <controld_messages.h>

-#include "controld_transition.h"

+#include <controld_transition.h>

 char *max_epoch = NULL;

 char *max_generation_from = NULL;

diff --git a/daemons/controld/controld_transition.h b/daemons/controld/controld_transition.h

index f31ac2d..192a9e8 100644

--- a/daemons/controld/controld_transition.h

+++ b/daemons/controld/controld_transition.h

@@ -8,10 +8,10 @@

 #ifndef TENGINE__H

 #  define TENGINE__H

-#  include <crm/transition.h>

 #  include <crm/common/mainloop.h>

 #  include <crm/stonith-ng.h>

 #  include <crm/services.h>

+#  include <pacemaker-internal.h>

 /* tengine */

 extern crm_action_t *match_down_event(const char *target);

diff --git a/daemons/controld/controld_utils.h b/daemons/controld/controld_utils.h

index 8b80e3c..1946a82 100644

--- a/daemons/controld/controld_utils.h

+++ b/daemons/controld/controld_utils.h

@@ -11,11 +11,10 @@

 #  define CRMD_UTILS__H

 #  include <crm/crm.h>

-#  include <crm/transition.h>

 #  include <crm/common/xml.h>

-#  include <crm/cib/internal.h> /* For CIB_OP_MODIFY */

-#  include "controld_fsa.h"     // For fsa_cib_conn

-#  include "controld_alerts.h"

+#  include <crm/cib/internal.h>     // CIB_OP_MODIFY

+#  include <controld_fsa.h>         // fsa_cib_conn

+#  include <controld_alerts.h>

 #  define FAKE_TE_ID	"xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"

diff --git a/include/crm/Makefile.am b/include/crm/Makefile.am

index 3f5f4bf..bc939eb 100644

--- a/include/crm/Makefile.am

+++ b/include/crm/Makefile.am

@@ -1,5 +1,5 @@

 #

-# Copyright 2004-2018 the Pacemaker project contributors

+# Copyright 2004-2019 the Pacemaker project contributors

 #

 # The version control history for this file may have further details.

 #

@@ -22,7 +22,6 @@ MAINTAINERCLEANFILES	= Makefile.in

 headerdir=$(pkgincludedir)/crm

 header_HEADERS		= attrd.h cib.h cluster.h compatibility.h crm.h \

-			  lrmd.h msg_xml.h services.h stonith-ng.h \

-			  transition.h

+			  lrmd.h msg_xml.h services.h stonith-ng.h

 SUBDIRS                 = common pengine cib fencing cluster

diff --git a/include/crm/transition.h b/include/crm/transition.h

deleted file mode 100644

index 6e9a875..0000000

--- a/include/crm/transition.h

+++ /dev/null

@@ -1,153 +0,0 @@

-/* 

- * Copyright 2004-2018 the Pacemaker project contributors

- *

- * The version control history for this file may have further details.

- * 

- * This program is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2 of the License, or (at your option) any later version.

- * 

- * This software is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * General Public License for more details.

- * 

- * You should have received a copy of the GNU Lesser General Public

- * License along with this library; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

- */

-#ifndef CRM_TRANSITION__H

-#  define CRM_TRANSITION__H

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#include <crm/crm.h>

-#include <crm/msg_xml.h>

-#include <crm/common/xml.h>

-

-typedef enum {

-    action_type_pseudo,

-    action_type_rsc,

-    action_type_crm

-} action_type_e;

-

-typedef struct te_timer_s crm_action_timer_t;

-typedef struct crm_graph_s crm_graph_t;

-

-typedef struct synapse_s {

-    int id;

-    int priority;

-

-    gboolean ready;

-    gboolean failed;

-    gboolean executed;

-    gboolean confirmed;

-

-    GListPtr actions;           /* crm_action_t* */

-    GListPtr inputs;            /* crm_action_t* */

-} synapse_t;

-

-typedef struct crm_action_s {

-    int id;

-    int timeout;

-    guint interval_ms;

-    GHashTable *params;

-    action_type_e type;

-

-    crm_action_timer_t *timer;

-    synapse_t *synapse;

-

-    gboolean sent_update;       /* sent to the CIB */

-    gboolean executed;          /* sent to the CRM */

-    gboolean confirmed;

-

-    gboolean failed;

-    gboolean can_fail;

-

-    xmlNode *xml;

-

-} crm_action_t;

-

-struct te_timer_s {

-    int source_id;

-    int timeout;

-    crm_action_t *action;

-};

-

-/* order matters here */

-enum transition_action {

-    tg_done,

-    tg_stop,

-    tg_restart,

-    tg_shutdown,

-};

-

-struct crm_graph_s {

-    int id;

-    char *source;

-    int abort_priority;

-

-    gboolean complete;

-    const char *abort_reason;

-    enum transition_action completion_action;

-

-    int num_actions;

-    int num_synapses;

-

-    int batch_limit;

-    int network_delay;

-    int stonith_timeout;

-    int transition_timeout;

-

-    int fired;

-    int pending;

-    int skipped;

-    int completed;

-    int incomplete;

-

-    GListPtr synapses;          /* synapse_t* */

-

-    int migration_limit;

-};

-

-typedef struct crm_graph_functions_s {

-    gboolean(*pseudo) (crm_graph_t * graph, crm_action_t * action);

-    gboolean(*rsc) (crm_graph_t * graph, crm_action_t * action);

-    gboolean(*crmd) (crm_graph_t * graph, crm_action_t * action);

-    gboolean(*stonith) (crm_graph_t * graph, crm_action_t * action);

-    gboolean(*allowed) (crm_graph_t * graph, crm_action_t * action);

-} crm_graph_functions_t;

-

-enum transition_status {

-    transition_active,

-    transition_pending,         /* active but no actions performed this time */

-    transition_complete,

-    transition_stopped,

-    transition_terminated,

-    transition_action_failed,

-    transition_failed,

-};

-

-void set_default_graph_functions(void);

-void set_graph_functions(crm_graph_functions_t * fns);

-crm_graph_t *unpack_graph(xmlNode * xml_graph, const char *reference);

-int run_graph(crm_graph_t * graph);

-gboolean update_graph(crm_graph_t * graph, crm_action_t * action);

-void destroy_graph(crm_graph_t * graph);

-const char *transition_status(enum transition_status state);

-void print_graph(unsigned int log_level, crm_graph_t * graph);

-void print_action(int log_level, const char *prefix, crm_action_t * action);

-bool update_abort_priority(crm_graph_t * graph, int priority,

-                           enum transition_action action, const char *abort_reason);

-const char *actiontype2text(action_type_e type);

-lrmd_event_data_t *convert_graph_action(xmlNode * resource, crm_action_t * action, int status,

-                                        int rc);

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

diff --git a/include/pacemaker-internal.h b/include/pacemaker-internal.h

index 3627ba5..51d7225 100644

--- a/include/pacemaker-internal.h

+++ b/include/pacemaker-internal.h

@@ -13,8 +13,8 @@

 #  include <pcmki/pcmki_error.h>

 #  include <pcmki/pcmki_sched_allocate.h>

 #  include <pcmki/pcmki_sched_notif.h>

-#  include <pcmki/pcmki_sched_transition.h>

 #  include <pcmki/pcmki_sched_utils.h>

 #  include <pcmki/pcmki_scheduler.h>

+#  include <pcmki/pcmki_transition.h>

 #endif

diff --git a/include/pcmki/Makefile.am b/include/pcmki/Makefile.am

index b163e89..4cf1cf2 100644

--- a/include/pcmki/Makefile.am

+++ b/include/pcmki/Makefile.am

@@ -9,11 +9,11 @@

 MAINTAINERCLEANFILES    = Makefile.in

-noinst_HEADERS	        = pcmki_error.h \

-						  pcmki_sched_allocate.h \

-						  pcmki_sched_notif.h \

-						  pcmki_sched_transition.h \

-						  pcmki_sched_utils.h \

-						  pcmki_scheduler.h

+noinst_HEADERS		= pcmki_error.h \

+			  pcmki_sched_allocate.h \

+			  pcmki_sched_notif.h \

+			  pcmki_sched_utils.h \

+			  pcmki_scheduler.h \

+			  pcmki_transition.h

 .PHONY: $(ARCHIVE_VERSION)

diff --git a/include/pcmki/pcmki_sched_transition.h b/include/pcmki/pcmki_sched_transition.h

deleted file mode 100644

index 41f5d61..0000000

--- a/include/pcmki/pcmki_sched_transition.h

+++ /dev/null

@@ -1,22 +0,0 @@

-/*

- * Copyright 2014-2019 the Pacemaker project contributors

- *

- * The version control history for this file may have further details.

- *

- * This source code is licensed under the GNU Lesser General Public License

- * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.

- */

-#ifndef SCHED_TRANSITION__H

-#  define SCHED_TRANSITION__H

-

-#include <crm/cib.h>

-

-void modify_configuration(

-    pe_working_set_t * data_set, cib_t *cib,

-    const char *quorum, const char *watchdog, GListPtr node_up, GListPtr node_down, GListPtr node_fail,

-    GListPtr op_inject, GListPtr ticket_grant, GListPtr ticket_revoke,

-    GListPtr ticket_standby, GListPtr ticket_activate);

-

-int run_simulation(pe_working_set_t * data_set, cib_t *cib, GListPtr op_fail_list, bool quiet);

-

-#endif

diff --git a/include/pcmki/pcmki_sched_utils.h b/include/pcmki/pcmki_sched_utils.h

index b47a2bb..4361235 100644

--- a/include/pcmki/pcmki_sched_utils.h

+++ b/include/pcmki/pcmki_sched_utils.h

@@ -10,6 +10,14 @@

 #ifndef PENGINE_AUTILS__H

 #  define PENGINE_AUTILS__H

+#include <stdbool.h>                    // bool

+#include <glib.h>                       // GList, GHashTable, gboolean, guint

+#include <crm/crm.h>                    // GListPtr

+#include <crm/cib.h>                    // cib_t

+#include <crm/pengine/pe_types.h>

+#include <crm/pengine/internal.h>

+#include <pcmki/pcmki_scheduler.h>

+

 /* Constraint helper functions */

 extern rsc_colocation_t *invert_constraint(rsc_colocation_t * constraint);

@@ -75,4 +83,12 @@ pe_action_t *sched_shutdown_op(pe_node_t *node, pe_working_set_t *data_set);

 #  define LOAD_STOPPED "load_stopped"

+void modify_configuration(

+    pe_working_set_t * data_set, cib_t *cib,

+    const char *quorum, const char *watchdog, GListPtr node_up, GListPtr node_down, GListPtr node_fail,

+    GListPtr op_inject, GListPtr ticket_grant, GListPtr ticket_revoke,

+    GListPtr ticket_standby, GListPtr ticket_activate);

+

+int run_simulation(pe_working_set_t * data_set, cib_t *cib, GListPtr op_fail_list, bool quiet);

+

 #endif

diff --git a/include/pcmki/pcmki_transition.h b/include/pcmki/pcmki_transition.h

new file mode 100644

index 0000000..d9a0ff6

--- /dev/null

+++ b/include/pcmki/pcmki_transition.h

@@ -0,0 +1,143 @@

+/*

+ * Copyright 2004-2019 the Pacemaker project contributors

+ *

+ * The version control history for this file may have further details.

+ *

+ * This source code is licensed under the GNU Lesser General Public License

+ * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.

+ */

+

+#ifndef CRM_TRANSITION__H

+#  define CRM_TRANSITION__H

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+

+#include <crm/crm.h>

+#include <crm/msg_xml.h>

+#include <crm/common/xml.h>

+

+typedef enum {

+    action_type_pseudo,

+    action_type_rsc,

+    action_type_crm

+} action_type_e;

+

+typedef struct te_timer_s crm_action_timer_t;

+typedef struct crm_graph_s crm_graph_t;

+

+typedef struct synapse_s {

+    int id;

+    int priority;

+

+    gboolean ready;

+    gboolean failed;

+    gboolean executed;

+    gboolean confirmed;

+

+    GListPtr actions;           /* crm_action_t* */

+    GListPtr inputs;            /* crm_action_t* */

+} synapse_t;

+

+typedef struct crm_action_s {

+    int id;

+    int timeout;

+    guint interval_ms;

+    GHashTable *params;

+    action_type_e type;

+

+    crm_action_timer_t *timer;

+    synapse_t *synapse;

+

+    gboolean sent_update;       /* sent to the CIB */

+    gboolean executed;          /* sent to the CRM */

+    gboolean confirmed;

+

+    gboolean failed;

+    gboolean can_fail;

+

+    xmlNode *xml;

+

+} crm_action_t;

+

+struct te_timer_s {

+    int source_id;

+    int timeout;

+    crm_action_t *action;

+};

+

+/* order matters here */

+enum transition_action {

+    tg_done,

+    tg_stop,

+    tg_restart,

+    tg_shutdown,

+};

+

+struct crm_graph_s {

+    int id;

+    char *source;

+    int abort_priority;

+

+    gboolean complete;

+    const char *abort_reason;

+    enum transition_action completion_action;

+

+    int num_actions;

+    int num_synapses;

+

+    int batch_limit;

+    int network_delay;

+    int stonith_timeout;

+    int transition_timeout;

+

+    int fired;

+    int pending;

+    int skipped;

+    int completed;

+    int incomplete;

+

+    GListPtr synapses;          /* synapse_t* */

+

+    int migration_limit;

+};

+

+typedef struct crm_graph_functions_s {

+    gboolean(*pseudo) (crm_graph_t * graph, crm_action_t * action);

+    gboolean(*rsc) (crm_graph_t * graph, crm_action_t * action);

+    gboolean(*crmd) (crm_graph_t * graph, crm_action_t * action);

+    gboolean(*stonith) (crm_graph_t * graph, crm_action_t * action);

+    gboolean(*allowed) (crm_graph_t * graph, crm_action_t * action);

+} crm_graph_functions_t;

+

+enum transition_status {

+    transition_active,

+    transition_pending,         /* active but no actions performed this time */

+    transition_complete,

+    transition_stopped,

+    transition_terminated,

+    transition_action_failed,

+    transition_failed,

+};

+

+void set_default_graph_functions(void);

+void set_graph_functions(crm_graph_functions_t * fns);

+crm_graph_t *unpack_graph(xmlNode * xml_graph, const char *reference);

+int run_graph(crm_graph_t * graph);

+gboolean update_graph(crm_graph_t * graph, crm_action_t * action);

+void destroy_graph(crm_graph_t * graph);

+const char *transition_status(enum transition_status state);

+void print_graph(unsigned int log_level, crm_graph_t * graph);

+void print_action(int log_level, const char *prefix, crm_action_t * action);

+bool update_abort_priority(crm_graph_t * graph, int priority,

+                           enum transition_action action, const char *abort_reason);

+const char *actiontype2text(action_type_e type);

+lrmd_event_data_t *convert_graph_action(xmlNode * resource, crm_action_t * action, int status,

+                                        int rc);

+

+#ifdef __cplusplus

+}

+#endif

+

+#endif

diff --git a/lib/pacemaker/pcmk_sched_transition.c b/lib/pacemaker/pcmk_sched_transition.c

index 0fa5709..8ab8d82 100644

--- a/lib/pacemaker/pcmk_sched_transition.c

+++ b/lib/pacemaker/pcmk_sched_transition.c

@@ -1,5 +1,5 @@

 /*

- * Copyright 2009-2018 Andrew Beekhof <andrew@beekhof.net>

+ * Copyright 2009-2019 the Pacemaker project contributors

  *

  * This source code is licensed under the GNU General Public License version 2

  * or later (GPLv2+) WITHOUT ANY WARRANTY.

@@ -19,7 +19,6 @@

 #include <crm/crm.h>

 #include <crm/cib.h>

 #include <crm/common/util.h>

-#include <crm/transition.h>

 #include <crm/common/iso8601.h>

 #include <crm/pengine/status.h>

 #include <pacemaker-internal.h>

diff --git a/lib/pacemaker/pcmk_trans_graph.c b/lib/pacemaker/pcmk_trans_graph.c

index 71568dd..77980e5 100644

--- a/lib/pacemaker/pcmk_trans_graph.c

+++ b/lib/pacemaker/pcmk_trans_graph.c

@@ -1,19 +1,10 @@

-/* 

- * Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>

- * 

- * This library is free software; you can redistribute it and/or

- * modify it under the terms of the GNU Lesser General Public

- * License as published by the Free Software Foundation; either

- * version 2.1 of the License, or (at your option) any later version.

- * 

- * This library is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

- * Lesser General Public License for more details.

- * 

- * You should have received a copy of the GNU Lesser General Public

- * License along with this library; if not, write to the Free Software

- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

+/*

+ * Copyright 2004-2019 the Pacemaker project contributors

+ *

+ * The version control history for this file may have further details.

+ *

+ * This source code is licensed under the GNU Lesser General Public License

+ * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.

  */

 #include <crm_internal.h>

@@ -21,9 +12,7 @@

 #include <crm/crm.h>

 #include <crm/msg_xml.h>

 #include <crm/common/xml.h>

-#include <crm/transition.h>

-/* #include <sys/param.h> */

-/*  */

+#include <pacemaker-internal.h>

 crm_graph_functions_t *graph_fns = NULL;

diff --git a/lib/pacemaker/pcmk_trans_unpack.c b/lib/pacemaker/pcmk_trans_unpack.c