From ea636bc7b290325a8d11f56c4ca461d4d010643d Mon Sep 17 00:00:00 2001

From: Ken Gaillot <kgaillot@redhat.com>

Date: Mon, 14 Sep 2020 16:29:19 -0500

Subject: [PATCH 1/6] Refactor: tools: restructure crm_resource command-line

 resource configuration

... to allow (future) options other than --validate to use the command-line

resource configuration options.

I had planned to use this for a project but went in different direction, so

nothing more is expected to use it for now, but I think it's still worthwhile

to help isolate different parts of code.

---

 tools/crm_resource.c | 189 ++++++++++++++++++++++++++-------------------------

 1 file changed, 98 insertions(+), 91 deletions(-)

diff --git a/tools/crm_resource.c b/tools/crm_resource.c

index 2fc9a86..1dcb0f0 100644

--- a/tools/crm_resource.c

+++ b/tools/crm_resource.c

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

 /*

- * Copyright 2004-2020 the Pacemaker project contributors

+ * Copyright 2004-2021 the Pacemaker project contributors

  *

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

  *

@@ -66,39 +66,46 @@ enum rsc_command {

 };

 struct {

-    enum rsc_command rsc_cmd;   // The crm_resource command to perform

-    const char *attr_set_type;

-    int cib_options;

-    gboolean clear_expired;

-    int find_flags;             /* Flags to use when searching for resource */

-    gboolean force;

-    gchar *host_uname;

-    gchar *interval_spec;

-    gchar *move_lifetime;

-    gchar *operation;

-    GHashTable *override_params;

-    gchar *prop_id;

-    char *prop_name;

-    gchar *prop_set;

-    gchar *prop_value;

-    gboolean recursive;

-    gchar **remainder;

-    gboolean require_cib;           // Whether command requires CIB connection

-    gboolean require_crmd;          /* whether command requires controller connection */

-    gboolean require_dataset;       /* whether command requires populated dataset instance */

-    gboolean require_resource;      /* whether command requires that resource be specified */

-    int resource_verbose;

-    gchar *rsc_id;

-    gchar *rsc_type;

-    gboolean promoted_role_only;

-    int timeout_ms;

-    char *agent_spec;               // Standard and/or provider and/or agent

-    char *v_agent;

-    char *v_class;

-    char *v_provider;

-    gboolean validate_cmdline;      /* whether we are just validating based on command line options */

-    GHashTable *validate_options;

-    gchar *xml_file;

+    enum rsc_command rsc_cmd;     // crm_resource command to perform

+

+    // Infrastructure that given command needs to work

+    gboolean require_cib;         // Whether command requires CIB IPC

+    int cib_options;              // Options to use with CIB IPC calls

+    gboolean require_crmd;        // Whether command requires controller IPC

+    gboolean require_dataset;     // Whether command requires populated data set

+    gboolean require_resource;    // Whether command requires resource specified

+    int find_flags;               // Flags to use when searching for resource

+

+    // Command-line option values

+    gchar *rsc_id;                // Value of --resource

+    gchar *rsc_type;              // Value of --resource-type

+    gboolean force;               // --force was given

+    gboolean clear_expired;       // --expired was given

+    gboolean recursive;           // --recursive was given

+    gboolean promoted_role_only;  // --master was given

+    gchar *host_uname;            // Value of --node

+    gchar *interval_spec;         // Value of --interval

+    gchar *move_lifetime;         // Value of --lifetime

+    gchar *operation;             // Value of --operation

+    const char *attr_set_type;    // Instance, meta, or utilization attribute

+    gchar *prop_id;               // --nvpair (attribute XML ID)

+    char *prop_name;              // Attribute name

+    gchar *prop_set;              // --set-name (attribute block XML ID)

+    gchar *prop_value;            // --parameter-value (attribute value)

+    int timeout_ms;               // Parsed from --timeout value

+    char *agent_spec;             // Standard and/or provider and/or agent

+    gchar *xml_file;              // Value of (deprecated) --xml-file

+

+    // Resource configuration specified via command-line arguments

+    gboolean cmdline_config;      // Resource configuration was via arguments

+    char *v_agent;                // Value of --agent

+    char *v_class;                // Value of --class

+    char *v_provider;             // Value of --provider

+    GHashTable *cmdline_params;   // Resource parameters specified

+

+    // Positional command-line arguments

+    gchar **remainder;            // Positional arguments as given

+    GHashTable *override_params;  // Resource parameter values that override config

 } options = {

     .attr_set_type = XML_TAG_ATTR_SETS,

     .cib_options = cib_sync_call,

@@ -533,28 +540,6 @@ static GOptionEntry advanced_entries[] = {

     { NULL }

 };

-static GOptionEntry validate_entries[] = {

-    { "class", 0, G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, class_cb,

-      "The standard the resource agent confirms to (for example, ocf).\n"

-      INDENT "Use with --agent, --provider, --option, and --validate.",

-      "CLASS" },

-    { "agent", 0, G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, agent_provider_cb,

-      "The agent to use (for example, IPaddr). Use with --class,\n"

-      INDENT "--provider, --option, and --validate.",

-      "AGENT" },

-    { "provider", 0, G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, agent_provider_cb,

-      "The vendor that supplies the resource agent (for example,\n"

-      INDENT "heartbeat). Use with --class, --agent, --option, and --validate.",

-      "PROVIDER" },

-    { "option", 0, G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, option_cb,

-      "Specify a device configuration parameter as NAME=VALUE (may be\n"

-      INDENT "specified multiple times). Use with --validate and without the\n"

-      INDENT "-r option.",

-      "PARAM" },

-

-    { NULL }

-};

-

 static GOptionEntry addl_entries[] = {

     { "node", 'N', G_OPTION_FLAG_NONE, G_OPTION_ARG_STRING, &options.host_uname,

       "Node name",

@@ -582,6 +567,23 @@ static GOptionEntry addl_entries[] = {

     { "interval", 'I', G_OPTION_FLAG_NONE, G_OPTION_ARG_STRING, &options.interval_spec,

       "Interval of operation to clear (default 0) (with -C -r -n)",

       "N" },

+    { "class", 0, G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, class_cb,

+      "The standard the resource agent conforms to (for example, ocf).\n"

+      INDENT "Use with --agent, --provider, --option, and --validate.",

+      "CLASS" },

+    { "agent", 0, G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, agent_provider_cb,

+      "The agent to use (for example, IPaddr). Use with --class,\n"

+      INDENT "--provider, --option, and --validate.",

+      "AGENT" },

+    { "provider", 0, G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, agent_provider_cb,

+      "The vendor that supplies the resource agent (for example,\n"

+      INDENT "heartbeat). Use with --class, --agent, --option, and --validate.",

+      "PROVIDER" },

+    { "option", 0, G_OPTION_FLAG_NONE, G_OPTION_ARG_CALLBACK, option_cb,

+      "Specify a device configuration parameter as NAME=VALUE (may be\n"

+      INDENT "specified multiple times). Use with --validate and without the\n"

+      INDENT "-r option.",

+      "PARAM" },

     { "set-name", 's', G_OPTION_FLAG_NONE, G_OPTION_ARG_STRING, &options.prop_set,

       "(Advanced) XML ID of attributes element to use (with -p, -d)",

       "ID" },

@@ -608,7 +610,7 @@ static GOptionEntry addl_entries[] = {

 gboolean

 agent_provider_cb(const gchar *option_name, const gchar *optarg, gpointer data, GError **error) {

-    options.validate_cmdline = TRUE;

+    options.cmdline_config = TRUE;

     options.require_resource = FALSE;

     if (pcmk__str_eq(option_name, "--provider", pcmk__str_casei)) {

@@ -654,7 +656,7 @@ class_cb(const gchar *option_name, const gchar *optarg, gpointer data, GError **

         options.v_class = strdup(optarg);

     }

-    options.validate_cmdline = TRUE;

+    options.cmdline_config = TRUE;

     options.require_resource = FALSE;

     return TRUE;

 }

@@ -762,10 +764,10 @@ option_cb(const gchar *option_name, const gchar *optarg, gpointer data,

     if (pcmk_scan_nvpair(optarg, &name, &value) != 2) {

         return FALSE;

     }

-    if (options.validate_options == NULL) {

-        options.validate_options = crm_str_table_new();

+    if (options.cmdline_params == NULL) {

+        options.cmdline_params = crm_str_table_new();

     }

-    g_hash_table_replace(options.validate_options, name, value);

+    g_hash_table_replace(options.cmdline_params, name, value);

     return TRUE;

 }

@@ -1365,17 +1367,18 @@ show_metadata(pcmk__output_t *out, const char *agent_spec, crm_exit_t *exit_code

 }

 static void

-validate_cmdline(crm_exit_t *exit_code)

+validate_cmdline_config(void)

 {

-    // -r cannot be used with any of --class, --agent, or --provider

+    // Cannot use both --resource and command-line resource configuration

     if (options.rsc_id != NULL) {

         g_set_error(&error, PCMK__EXITC_ERROR, CRM_EX_USAGE,

                     "--resource cannot be used with --class, --agent, and --provider");

-    // If --class, --agent, or --provider are given, --validate must also be given.

+    // Not all commands support command-line resource configuration

     } else if (options.rsc_cmd != cmd_execute_agent) {

         g_set_error(&error, PCMK__EXITC_ERROR, CRM_EX_USAGE,

-                    "--class, --agent, and --provider require --validate");

+                    "--class, --agent, and --provider can only be used with "

+                    "--validate");

     // Not all of --class, --agent, and --provider need to be given.  Not all

     // classes support the concept of a provider.  Check that what we were given

@@ -1398,15 +1401,16 @@ validate_cmdline(crm_exit_t *exit_code)

                     options.v_agent ? options.v_agent : "");

     }

-    if (error == NULL) {

-        if (options.validate_options == NULL) {

-            options.validate_options = crm_str_table_new();

-        }

-        *exit_code = cli_resource_execute_from_params(out, "test", options.v_class, options.v_provider, options.v_agent,

-                                                      "validate-all", options.validate_options,

-                                                      options.override_params, options.timeout_ms,

-                                                      options.resource_verbose, options.force);

+    if (error != NULL) {

+        return;

+    }

+

+    if (options.cmdline_params == NULL) {

+        options.cmdline_params = crm_str_table_new();

     }

+    options.require_resource = FALSE;

+    options.require_dataset = FALSE;

+    options.require_cib = FALSE;

 }

 static GOptionContext *

@@ -1467,8 +1471,6 @@ build_arg_context(pcmk__common_args_t *args, GOptionGroup **group) {

                         "Show command help", command_entries);

     pcmk__add_arg_group(context, "locations", "Locations:",

                         "Show location help", location_entries);

-    pcmk__add_arg_group(context, "validate", "Validate:",

-                        "Show validate help", validate_entries);

     pcmk__add_arg_group(context, "advanced", "Advanced:",

                         "Show advanced option help", advanced_entries);

     pcmk__add_arg_group(context, "additional", "Additional Options:",

@@ -1512,7 +1514,6 @@ main(int argc, char **argv)

         goto done;

     }

-    options.resource_verbose = args->verbosity;

     out->quiet = args->quiet;

     crm_log_args(argc, argv);

@@ -1628,15 +1629,15 @@ main(int argc, char **argv)

         goto done;

     }

-    // Sanity check validating from command line parameters.  If everything checks out,

-    // go ahead and run the validation.  This way we don't need a CIB connection.

-    if (options.validate_cmdline) {

-        validate_cmdline(&exit_code);

-        goto done;

-    } else if (options.validate_options != NULL) {

+    if (options.cmdline_config) {

+        /* A resource configuration was given on the command line. Sanity-check

+         * the values and set error if they don't make sense.

+         */

+        validate_cmdline_config();

+    } else if (options.cmdline_params != NULL) {

         // @COMPAT @TODO error out here when we can break backward compatibility

-        g_hash_table_destroy(options.validate_options);

-        options.validate_options = NULL;

+        g_hash_table_destroy(options.cmdline_params);

+        options.cmdline_params = NULL;

     }

     if (error != NULL) {

@@ -1773,12 +1774,18 @@ main(int argc, char **argv)

             break;

         case cmd_execute_agent:

-            exit_code = cli_resource_execute(out, rsc, options.rsc_id,

-                                             options.operation,

-                                             options.override_params,

-                                             options.timeout_ms, cib_conn,

-                                             data_set, options.resource_verbose,

-                                             options.force);

+            if (options.cmdline_config) {

+                exit_code = cli_resource_execute_from_params(out, "test",

+                    options.v_class, options.v_provider, options.v_agent,

+                    "validate-all", options.cmdline_params,

+                    options.override_params, options.timeout_ms,

+                    args->verbosity, options.force);

+            } else {

+                exit_code = cli_resource_execute(out, rsc, options.rsc_id,

+                    options.operation, options.override_params,

+                    options.timeout_ms, cib_conn, data_set,

+                    args->verbosity, options.force);

+            }

             break;

         case cmd_colocations:

@@ -2038,7 +2045,7 @@ done:

         g_hash_table_destroy(options.override_params);

     }

-    /* options.validate_options does not need to be destroyed here.  See the

+    /* options.cmdline_params does not need to be destroyed here.  See the

      * comments in cli_resource_execute_from_params.

      */

-- 

1.8.3.1

From e140bd1bc35a20f027f054b4575808bd0ef547fc Mon Sep 17 00:00:00 2001

From: Ken Gaillot <kgaillot@redhat.com>

Date: Wed, 16 Sep 2020 15:40:16 -0500

Subject: [PATCH 2/6] Low: tools: handle required node names better in

 crm_resource

Currently, --fail is the only option that requires a node name to be specified,

but generalize the handling so future options can reuse it.

This also makes the error handling closer to what's done for required resource

names, both in error message and exit status.

---

 tools/crm_resource.c         | 87 ++++++++++++++++++++++++++++----------------

 tools/crm_resource_runtime.c |  8 +---

 2 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/tools/crm_resource.c b/tools/crm_resource.c

index 1dcb0f0..2717a62 100644

--- a/tools/crm_resource.c

+++ b/tools/crm_resource.c

@@ -74,6 +74,7 @@ struct {

     gboolean require_crmd;        // Whether command requires controller IPC

     gboolean require_dataset;     // Whether command requires populated data set

     gboolean require_resource;    // Whether command requires resource specified

+    gboolean require_node;        // Whether command requires node specified

     int find_flags;               // Flags to use when searching for resource

     // Command-line option values

@@ -774,6 +775,7 @@ option_cb(const gchar *option_name, const gchar *optarg, gpointer data,

 gboolean

 fail_cb(const gchar *option_name, const gchar *optarg, gpointer data, GError **error) {

     options.require_crmd = TRUE;

+    options.require_node = TRUE;

     SET_COMMAND(cmd_fail);

     return TRUE;

 }

@@ -1483,9 +1485,13 @@ main(int argc, char **argv)

 {

     xmlNode *cib_xml_copy = NULL;

     pe_resource_t *rsc = NULL;

-

+    pe_node_t *node = NULL;

     int rc = pcmk_rc_ok;

+    /*

+     * Parse command line arguments

+     */

+

     pcmk__common_args_t *args = pcmk__new_common_args(SUMMARY);

     GOptionContext *context = NULL;

     GOptionGroup *output_group = NULL;

@@ -1502,6 +1508,10 @@ main(int argc, char **argv)

         goto done;

     }

+    /*

+     * Set verbosity

+     */

+

     for (int i = 0; i < args->verbosity; i++) {

         crm_bump_log_level(argc, argv);

     }

@@ -1518,9 +1528,9 @@ main(int argc, char **argv)

     crm_log_args(argc, argv);

-    if (options.host_uname) {

-        crm_trace("Option host => %s", options.host_uname);

-    }

+    /*

+     * Validate option combinations

+     */

     // If the user didn't explicitly specify a command, list resources

     if (options.rsc_cmd == cmd_none) {

@@ -1634,30 +1644,42 @@ main(int argc, char **argv)

          * the values and set error if they don't make sense.

          */

         validate_cmdline_config();

+        if (error != NULL) {

+            exit_code = CRM_EX_USAGE;

+            goto done;

+        }

+

     } else if (options.cmdline_params != NULL) {

         // @COMPAT @TODO error out here when we can break backward compatibility

         g_hash_table_destroy(options.cmdline_params);

         options.cmdline_params = NULL;

     }

-    if (error != NULL) {

+    if (options.require_resource && (options.rsc_id == NULL)) {

+        rc = ENXIO;

+        exit_code = CRM_EX_USAGE;

+        g_set_error(&error, PCMK__EXITC_ERROR, exit_code,

+                    "Must supply a resource id with -r");

+        goto done;

+    }

+    if (options.require_node && (options.host_uname == NULL)) {

+        rc = ENXIO;

         exit_code = CRM_EX_USAGE;

+        g_set_error(&error, PCMK__EXITC_ERROR, exit_code,

+                    "Must supply a node name with -N");

         goto done;

     }

+    /*

+     * Set up necessary connections

+     */

+

     if (options.force) {

         crm_debug("Forcing...");

         cib__set_call_options(options.cib_options, crm_system_name,

                               cib_quorum_override);

     }

-    if (options.require_resource && !options.rsc_id) {

-        rc = ENXIO;

-        g_set_error(&error, PCMK__EXITC_ERROR, CRM_EX_USAGE,

-                    "Must supply a resource id with -r");

-        goto done;

-    }

-

     if (options.find_flags && options.rsc_id) {

         options.require_dataset = TRUE;

     }

@@ -1700,6 +1722,11 @@ main(int argc, char **argv)

         }

     }

+    // If user supplied a node name, check whether it exists

+    if ((options.host_uname != NULL) && (data_set != NULL)) {

+        node = pe_find_node(data_set->nodes, options.host_uname);

+    }

+

     // Establish a connection to the controller if needed

     if (options.require_crmd) {

         rc = pcmk_new_ipc_api(&controld_api, pcmk_ipc_controld);

@@ -1718,6 +1745,10 @@ main(int argc, char **argv)

         }

     }

+    /*

+     * Handle requested command

+     */

+

     switch (options.rsc_cmd) {

         case cmd_list_resources: {

             GListPtr all = NULL;

@@ -1844,18 +1875,11 @@ main(int argc, char **argv)

             break;

         case cmd_why:

-            {

-                pe_node_t *dest = NULL;

-

-                if (options.host_uname) {

-                    dest = pe_find_node(data_set->nodes, options.host_uname);

-                    if (dest == NULL) {

-                        rc = pcmk_rc_node_unknown;

-                        goto done;

-                    }

-                }

-                out->message(out, "resource-reasons-list", cib_conn, data_set->resources, rsc, dest);

-                rc = pcmk_rc_ok;

+            if ((options.host_uname != NULL) && (node == NULL)) {

+                rc = pcmk_rc_node_unknown;

+            } else {

+                rc = out->message(out, "resource-reasons-list", cib_conn,

+                                  data_set->resources, rsc, node);

             }

             break;

@@ -1878,15 +1902,10 @@ main(int argc, char **argv)

         case cmd_ban:

             if (options.host_uname == NULL) {

                 rc = ban_or_move(out, rsc, options.move_lifetime, &exit_code);

+            } else if (node == NULL) {

+                rc = pcmk_rc_node_unknown;

             } else {

-                pe_node_t *dest = pe_find_node(data_set->nodes,

-                                               options.host_uname);

-

-                if (dest == NULL) {

-                    rc = pcmk_rc_node_unknown;

-                    goto done;

-                }

-                rc = cli_resource_ban(out, options.rsc_id, dest->details->uname,

+                rc = cli_resource_ban(out, options.rsc_id, node->details->uname,

                                       options.move_lifetime, NULL, cib_conn,

                                       options.cib_options,

                                       options.promoted_role_only);

@@ -2002,6 +2021,10 @@ main(int argc, char **argv)

             break;

     }

+    /*

+     * Clean up and exit

+     */

+

 done:

     if (rc != pcmk_rc_ok) {

         if (rc == pcmk_rc_no_quorum) {

diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c

index 3f28c7b..de5e807 100644

--- a/tools/crm_resource_runtime.c

+++ b/tools/crm_resource_runtime.c

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

 /*

- * Copyright 2004-2020 the Pacemaker project contributors

+ * Copyright 2004-2021 the Pacemaker project contributors

  *

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

  *

@@ -511,11 +511,7 @@ send_lrm_rsc_op(pcmk__output_t *out, pcmk_ipc_api_t *controld_api, bool do_fail_

         return EINVAL;

     }

-    if (host_uname == NULL) {

-        out->err(out, "Please specify a node name");

-        return EINVAL;

-

-    } else {

+    {

         pe_node_t *node = pe_find_node(data_set->nodes, host_uname);

         if (node == NULL) {

-- 

1.8.3.1

From 31bda91470487790d6e17b6f2cbed282bafd11d0 Mon Sep 17 00:00:00 2001

From: Ken Gaillot <kgaillot@redhat.com>

Date: Tue, 15 Sep 2020 15:00:53 -0500

Subject: [PATCH 3/6] Refactor: libpacemaker: add files for resource-related

 API

---

 include/pacemaker-internal.h   |  3 ++-

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

 include/pcmki/pcmki_resource.h | 14 ++++++++++++++

 lib/pacemaker/Makefile.am      |  3 ++-

 lib/pacemaker/pcmk_resource.c  | 21 +++++++++++++++++++++

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

 create mode 100644 include/pcmki/pcmki_resource.h

 create mode 100644 lib/pacemaker/pcmk_resource.c

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

index 2e75d09..bf33f3e 100644

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

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

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

 /*

- * Copyright 2019 the Pacemaker project contributors

+ * Copyright 2019-2021 the Pacemaker project contributors

  *

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

  *

@@ -14,6 +14,7 @@

 #  include <pcmki/pcmki_cluster_queries.h>

 #  include <pcmki/pcmki_fence.h>

 #  include <pcmki/pcmki_output.h>

+#  include <pcmki/pcmki_resource.h>

 #  include <pcmki/pcmki_sched_allocate.h>

 #  include <pcmki/pcmki_sched_notif.h>

 #  include <pcmki/pcmki_sched_utils.h>

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

index 7aa64c7..446c801 100644

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

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

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

 #

-# Copyright 2019 the Pacemaker project contributors

+# Copyright 2019-2021 the Pacemaker project contributors

 #

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

 #

@@ -13,6 +13,7 @@ noinst_HEADERS		= pcmki_error.h \

 			  pcmki_cluster_queries.h \

 			  pcmki_fence.h \

 			  pcmki_output.h \

+			  pcmki_resource.h \

 			  pcmki_sched_allocate.h \

 			  pcmki_sched_notif.h \

 			  pcmki_sched_utils.h \

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

new file mode 100644

index 0000000..effa945

--- /dev/null

+++ b/include/pcmki/pcmki_resource.h

@@ -0,0 +1,14 @@

+/*

+ * Copyright 2021 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 PCMKI_RESOURCE__H

+#define PCMKI_RESOURCE__H

+

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

+

+#endif /* PCMK_RESOURCE__H */

diff --git a/lib/pacemaker/Makefile.am b/lib/pacemaker/Makefile.am

index 4129ade..760c04a 100644

--- a/lib/pacemaker/Makefile.am

+++ b/lib/pacemaker/Makefile.am

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

 #

-# Copyright 2004-2019 the Pacemaker project contributors

+# Copyright 2004-2021 the Pacemaker project contributors

 #

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

 #

@@ -31,6 +31,7 @@ libpacemaker_la_SOURCES	=

 libpacemaker_la_SOURCES += pcmk_cluster_queries.c

 libpacemaker_la_SOURCES += pcmk_fence.c

 libpacemaker_la_SOURCES += pcmk_output.c

+libpacemaker_la_SOURCES += pcmk_resource.c

 libpacemaker_la_SOURCES	+= pcmk_sched_allocate.c

 libpacemaker_la_SOURCES += pcmk_sched_bundle.c

 libpacemaker_la_SOURCES += pcmk_sched_clone.c

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

new file mode 100644

index 0000000..05614fc

--- /dev/null

+++ b/lib/pacemaker/pcmk_resource.c

@@ -0,0 +1,21 @@

+/*

+ * Copyright 2021 the Pacemaker project contributors

+ *

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

+ *

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

+ * or later (GPLv2+) WITHOUT ANY WARRANTY.

+ */

+

+#include <crm_internal.h>

+

+#include <glib.h>

+#include <libxml/tree.h>

+

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

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

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

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

+

+#include <pacemaker.h>

+#include <pacemaker-internal.h>

-- 

1.8.3.1

From e45fe95cc6f526ab67ab6f718aa1364861ca525b Mon Sep 17 00:00:00 2001

From: Ken Gaillot <kgaillot@redhat.com>

Date: Tue, 15 Sep 2020 15:32:25 -0500

Subject: [PATCH 4/6] API: libpacemaker: new API pcmk_resource_digests()

---

 include/pacemaker.h            |  22 +++++++-

 include/pcmki/pcmki_resource.h |   7 +++

 lib/pacemaker/pcmk_output.c    | 107 +++++++++++++++++++++++++++++++++++-

 lib/pacemaker/pcmk_resource.c  | 119 +++++++++++++++++++++++++++++++++++++++++

 xml/Makefile.am                |  10 +++-

 xml/api/digests-2.6.rng        |  33 ++++++++++++

 6 files changed, 293 insertions(+), 5 deletions(-)

 create mode 100644 xml/api/digests-2.6.rng

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

index b2a73cd..51bf585 100644

--- a/include/pacemaker.h

+++ b/include/pacemaker.h

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

 /*

- * Copyright 2019 the Pacemaker project contributors

+ * Copyright 2019-2021 the Pacemaker project contributors

  *

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

  *

@@ -20,8 +20,11 @@ extern "C" {

  * \ingroup pacemaker

  */

-#  include <crm/stonith-ng.h>

+#  include <glib.h>

 #  include <libxml/tree.h>

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

+

+#  include <crm/stonith-ng.h>

 /*!

  * \brief Get controller status

@@ -55,6 +58,21 @@ int pcmk_designated_controller(xmlNodePtr *xml, unsigned int message_timeout_ms)

  */

 int pcmk_pacemakerd_status(xmlNodePtr *xml, char *ipc_name, unsigned int message_timeout_ms);

+/*!

+ * \brief Calculate and output resource operation digests