Refactor: libcib: Drop enum cib__op_attr

Replace it with a boolean "modifies_cib".

Signed-off-by: Reid Wahl <nrwahl@protonmail.com>

Author: nrwahl2

daemons/based/based_callbacks.c

@@ -584,7 +584,7 @@ log_op_result(const xmlNode *request, const cib__operation_t *operation, int rc,
     int epoch = 0;
     int num_updates = 0;
 
-    if (!pcmk__is_set(operation->flags, cib__op_attr_modifies)) {
+    if (!operation->modifies_cib) {
         level = LOG_TRACE;
 
     } else if (rc != pcmk_rc_ok) {
@@ -716,7 +716,7 @@ based_handle_request(pcmk__request_t *request)
     } else if (request->ipc_client != NULL) {
         // Forward modifying and non-local requests via cluster
         if (!based_stand_alone()
-            && (pcmk__is_set(operation->flags, cib__op_attr_modifies)
+            && (operation->modifies_cib
                 || !pcmk__str_eq(host, OUR_NODENAME,
                                  pcmk__str_casei|pcmk__str_null_matches))) {
 
@@ -761,7 +761,7 @@ based_handle_request(pcmk__request_t *request)
 
     start_time = time(NULL);
 
-    if (!pcmk__is_set(operation->flags, cib__op_attr_modifies)) {
+    if (!operation->modifies_cib) {
         rc = cib__perform_op_ro(op_function, request->xml, &based_cib, &output);
 
     } else {
@@ -775,9 +775,7 @@ based_handle_request(pcmk__request_t *request)
     }
 
 done:
-    if (!pcmk__is_set(operation->flags, cib__op_attr_modifies)
-        && needs_reply && !based_stand_alone()) {
-
+    if (!operation->modifies_cib && needs_reply && !based_stand_alone()) {
         send_peer_reply(reply, originator);
     }
 

include/crm/cib/internal.h

@@ -38,18 +38,6 @@ extern "C" {
 #define PCMK__CIB_REQUEST_COMMIT_TRANSACT   "cib_commit_transact"
 #define PCMK__CIB_REQUEST_SCHEMAS       "cib_schemas"
 
-/*!
- * \internal
- * \brief Flags for CIB operation attributes
- */
-enum cib__op_attr {
-    //! No special attributes
-    cib__op_attr_none           = 0,
-
-    //! May modify state (of the CIB itself or of the CIB manager)
-    cib__op_attr_modifies       = (UINT32_C(1) << 1),
-};
-
 /*!
  * \internal
  * \brief Types of CIB operations
@@ -89,7 +77,7 @@ typedef int (*cib__op_fn_t)(xmlNode *request, xmlNode **cib, xmlNode **output);
 typedef struct cib__operation_s {
     const char *name;
     enum cib__op_type type;
-    uint32_t flags; //!< Group of <tt>enum cib__op_attr</tt> flags
+    bool modifies_cib;
 } cib__operation_t;
 
 typedef struct cib_notify_client_s {

lib/cib/cib_file.c

@@ -146,7 +146,6 @@ process_request(cib_t *cib, xmlNode *request, xmlNode **output)
     const char *op = pcmk__xe_get(request, PCMK__XA_CIB_OP);
 
     bool changed = false;
-    bool read_only = false;
     xmlNode *result_cib = NULL;
     xmlNode *cib_diff = NULL;
     xmlNode *local_output = NULL;
@@ -167,9 +166,7 @@ process_request(cib_t *cib, xmlNode *request, xmlNode **output)
         pcmk__warn("Couldn't parse options from request: %s", pcmk_rc_str(rc));
     }
 
-    read_only = !pcmk__is_set(operation->flags, cib__op_attr_modifies);
-
-    if (read_only) {
+    if (!operation->modifies_cib) {
         rc = cib__perform_op_ro(op_function, request, &private->cib_xml,
                                 &local_output);
     } else {
@@ -189,7 +186,7 @@ process_request(cib_t *cib, xmlNode *request, xmlNode **output)
         // Show validation errors to stderr
         pcmk__validate_xml(result_cib, NULL, NULL);
 
-    } else if ((rc == pcmk_rc_ok) && !read_only) {
+    } else if ((rc == pcmk_rc_ok) && operation->modifies_cib) {
         if (result_cib != private->cib_xml) {
             pcmk__xml_free(private->cib_xml);
             private->cib_xml = result_cib;

lib/cib/cib_ops.c

@@ -35,57 +35,55 @@ static GHashTable *operation_table = NULL;
 
 static const cib__operation_t cib_ops[] = {
     {
-        PCMK__CIB_REQUEST_APPLY_PATCH, cib__op_apply_patch,
-        cib__op_attr_modifies
+        PCMK__CIB_REQUEST_APPLY_PATCH, cib__op_apply_patch, true
     },
     {
-        PCMK__CIB_REQUEST_BUMP, cib__op_bump, cib__op_attr_modifies
+        PCMK__CIB_REQUEST_BUMP, cib__op_bump, true
     },
     {
-        PCMK__CIB_REQUEST_COMMIT_TRANSACT, cib__op_commit_transact,
-        cib__op_attr_modifies
+        PCMK__CIB_REQUEST_COMMIT_TRANSACT, cib__op_commit_transact, true
     },
     {
-        PCMK__CIB_REQUEST_CREATE, cib__op_create, cib__op_attr_modifies
+        PCMK__CIB_REQUEST_CREATE, cib__op_create, true
     },
     {
-        PCMK__CIB_REQUEST_DELETE, cib__op_delete, cib__op_attr_modifies
+        PCMK__CIB_REQUEST_DELETE, cib__op_delete, true
     },
     {
-        PCMK__CIB_REQUEST_ERASE, cib__op_erase, cib__op_attr_modifies
+        PCMK__CIB_REQUEST_ERASE, cib__op_erase, true
     },
     {
-        PCMK__CIB_REQUEST_MODIFY, cib__op_modify, cib__op_attr_modifies
+        PCMK__CIB_REQUEST_MODIFY, cib__op_modify, true
     },
     {
-        PCMK__CIB_REQUEST_NOOP, cib__op_noop, cib__op_attr_none
+        PCMK__CIB_REQUEST_NOOP, cib__op_noop, false
     },
     {
-        CRM_OP_PING, cib__op_ping, cib__op_attr_none
+        CRM_OP_PING, cib__op_ping, false
     },
     {
-        PCMK__CIB_REQUEST_PRIMARY, cib__op_primary, cib__op_attr_none
+        PCMK__CIB_REQUEST_PRIMARY, cib__op_primary, false
     },
     {
-        PCMK__CIB_REQUEST_QUERY, cib__op_query, cib__op_attr_none
+        PCMK__CIB_REQUEST_QUERY, cib__op_query, false
     },
     {
-        PCMK__CIB_REQUEST_REPLACE, cib__op_replace, cib__op_attr_modifies
+        PCMK__CIB_REQUEST_REPLACE, cib__op_replace, true
     },
     {
-        PCMK__CIB_REQUEST_SCHEMAS, cib__op_schemas, cib__op_attr_none
+        PCMK__CIB_REQUEST_SCHEMAS, cib__op_schemas, false
     },
     {
-        PCMK__CIB_REQUEST_SECONDARY, cib__op_secondary, cib__op_attr_none
+        PCMK__CIB_REQUEST_SECONDARY, cib__op_secondary, false
     },
     {
-        PCMK__CIB_REQUEST_SHUTDOWN, cib__op_shutdown, cib__op_attr_none
+        PCMK__CIB_REQUEST_SHUTDOWN, cib__op_shutdown, false
     },
     {
-        PCMK__CIB_REQUEST_SYNC, cib__op_sync, cib__op_attr_none
+        PCMK__CIB_REQUEST_SYNC, cib__op_sync, false
     },
     {
-        PCMK__CIB_REQUEST_UPGRADE, cib__op_upgrade, cib__op_attr_modifies
+        PCMK__CIB_REQUEST_UPGRADE, cib__op_upgrade, true
     },
 };