Handle errors from cluster_status

daemons/execd/cts-exec-helper.c

@@ -475,7 +475,7 @@ generate_params(void)
     pcmk__set_scheduler_flags(scheduler, pcmk__sched_no_counts);
     scheduler->input = cib_xml_copy;
     scheduler->priv->now = crm_time_new(NULL);
-    cluster_status(scheduler);
+    pcmk_unpack_scheduler_input(scheduler);
 
     // Find resource in CIB
     rsc = pe_find_resource_with_flags(scheduler->priv->resources,

include/crm/pengine/status.h

@@ -32,9 +32,6 @@ const char *rsc_printable_id(const pcmk_resource_t *rsc);
 
 int pcmk_unpack_scheduler_input(pcmk_scheduler_t *scheduler);
 
-// NOTE: sbd (as of at least 1.5.2) uses this
-gboolean cluster_status(pcmk_scheduler_t *scheduler);
-
 // NOTE: sbd (as of at least 1.5.2) uses this
 pcmk_scheduler_t *pe_new_working_set(void);
 

include/crm/pengine/status_compat.h

@@ -27,6 +27,9 @@ extern "C" {
  *             release.
  */
 
+// NOTE: sbd (as of at least 1.5.2) uses this
+gboolean cluster_status(pcmk_scheduler_t *scheduler);
+
 // NOTE: sbd (as of at least 1.5.2) uses this
 //! \deprecated Use pcmk_find_node() with scheduler object instead
 pcmk_node_t *pe_find_node(const GList *node_list, const char *node_name);

lib/pacemaker/pcmk_scheduler.c

@@ -756,7 +756,7 @@ unpack_cib(xmlNode *cib, unsigned long long flags, pcmk_scheduler_t *scheduler)
 
     pcmk__set_scheduler_flags(scheduler, flags);
     scheduler->input = cib;
-    cluster_status(scheduler); // Sets pcmk__sched_have_status
+    pcmk_unpack_scheduler_input(scheduler); // Sets pcmk__sched_have_status
 }
 
 /*!
@@ -873,7 +873,7 @@ pcmk__init_scheduler(pcmk__output_t *out, xmlNodePtr input, const crm_time_t *da
     }
 
     // Unpack everything
-    cluster_status(new_scheduler);
+    pcmk_unpack_scheduler_input(new_scheduler);
     *scheduler = new_scheduler;
 
     return pcmk_rc_ok;

lib/pacemaker/pcmk_simulate.c

@@ -809,7 +809,7 @@ pcmk__simulate(pcmk_scheduler_t *scheduler, pcmk__output_t *out,
     }
 
     reset(scheduler, input, out, use_date, flags);
-    cluster_status(scheduler);
+    pcmk_unpack_scheduler_input(scheduler);
 
     if (!out->is_quiet(out)) {
         const bool show_pending = pcmk_is_set(flags, pcmk_sim_show_pending);
@@ -862,7 +862,7 @@ pcmk__simulate(pcmk_scheduler_t *scheduler, pcmk__output_t *out,
 
         cleanup_calculations(scheduler);
         reset(scheduler, input, out, use_date, flags);
-        cluster_status(scheduler);
+        pcmk_unpack_scheduler_input(scheduler);
     }
 
     if (input_file != NULL) {
@@ -972,7 +972,7 @@ pcmk__simulate(pcmk_scheduler_t *scheduler, pcmk__output_t *out,
         pcmk__set_scheduler_flags(scheduler, pcmk__sched_show_utilization);
     }
 
-    cluster_status(scheduler);
+    pcmk_unpack_scheduler_input(scheduler);
     print_cluster_status(scheduler, 0, section_opts, "Revised Cluster Status",
                          true);
 

lib/pacemaker/pcmk_status.c

@@ -104,7 +104,7 @@ pcmk__output_cluster_status(pcmk_scheduler_t *scheduler, stonith_t *stonith,
 
     pe_reset_working_set(scheduler);
     scheduler->input = cib_copy;
-    cluster_status(scheduler);
+    pcmk_unpack_scheduler_input(scheduler);
 
     /* Unpack constraints if any section will need them
      * (tickets may be referenced in constraints but not granted yet,

lib/pengine/status.c

@@ -208,12 +208,6 @@ pcmk_unpack_scheduler_input(pcmk_scheduler_t *scheduler)
     return pcmk_rc_ok;
 }
 
-gboolean
-cluster_status(pcmk_scheduler_t * scheduler)
-{
-    return pcmk_unpack_scheduler_input(scheduler) == pcmk_rc_ok;
-}
-
 /*!
  * \internal
  * \brief Free a list of pcmk_resource_t
@@ -537,6 +531,12 @@ pe_find_node_id(const GList *nodes, const char *id)
 
 #include <crm/pengine/status_compat.h>
 
+gboolean
+cluster_status(pcmk_scheduler_t * scheduler)
+{
+    return pcmk_unpack_scheduler_input(scheduler) == pcmk_rc_ok;
+}
+
 /*!
  * \brief Find a node by name in a list of nodes
  *

lib/pengine/tests/native/native_find_rsc_test.c

@@ -46,7 +46,7 @@ setup(void **state) {
     pcmk__set_scheduler_flags(scheduler, pcmk__sched_no_counts);
     scheduler->input = input;
 
-    cluster_status(scheduler);
+    pcmk_unpack_scheduler_input(scheduler);
 
     /* Get references to the cluster nodes so we don't have to find them repeatedly. */
     cluster01 = pcmk_find_node(scheduler, "cluster01");

lib/pengine/tests/native/pe_base_name_eq_test.c

@@ -45,7 +45,7 @@ setup(void **state) {
     pcmk__set_scheduler_flags(scheduler, pcmk__sched_no_counts);
     scheduler->input = input;
 
-    cluster_status(scheduler);
+    pcmk_unpack_scheduler_input(scheduler);
 
     /* Get references to several resources we use frequently. */
     for (GList *iter = scheduler->priv->resources;

tools/crm_resource.c

@@ -959,7 +959,7 @@ clear_constraints(pcmk__output_t *out)
         }
 
         scheduler->input = cib_xml;
-        cluster_status(scheduler);
+        pcmk_unpack_scheduler_input(scheduler);
 
         after = build_constraint_list(scheduler->input);
         remaining = pcmk__subtract_lists(before, after, (GCompareFunc) strcmp);
@@ -993,7 +993,7 @@ initialize_scheduler_data(xmlNode **cib_xml_orig)
         return rc;
     }
 
-    cluster_status(scheduler);
+    pcmk_unpack_scheduler_input(scheduler);
     return pcmk_rc_ok;
 }
 

tools/crm_resource_runtime.c

@@ -1491,7 +1491,7 @@ update_dataset(cib_t *cib, pcmk_scheduler_t *scheduler, xmlNode **cib_xml_orig,
 
         pcmk__xml_free(*cib_xml_orig);
         *cib_xml_orig = xml;
-        cluster_status(scheduler);
+        pcmk_unpack_scheduler_input(scheduler);
     }
 
   done:

tools/crm_ticket.c

@@ -441,7 +441,7 @@ main(int argc, char **argv)
     scheduler->input = cib_xml_copy;
     scheduler->priv->now = crm_time_new(NULL);
 
-    cluster_status(scheduler);
+    pcmk_unpack_scheduler_input(scheduler);
 
     /* For recording the tickets that are referenced in PCMK_XE_RSC_TICKET
      * constraints but have never been granted yet.