modules: Move feasibility/satisfiability checking into a new module

etc/rc1.d/01-sched-fluxion

@@ -1,13 +1,21 @@
 #!/bin/sh -e
 
-test $(flux getattr rank) -eq 0 || exit 0
+if [ -z ${FLUXION_RESOURCE_RC_NOOP} ]; then
+    if [ $(flux getattr rank) -eq 0 ]; then
+        flux module reload -f sched-fluxion-resource \
+            ${FLUXION_RESOURCE_OPTIONS:-"load-allowlist=node,core,gpu"}
+    fi
+fi
 
 if [ -z ${FLUXION_RESOURCE_RC_NOOP} ]; then
-    flux module reload -f sched-fluxion-resource \
+    if [ $(flux getattr rank) -eq 0 ]; then
+    flux module reload -f sched-fluxion-feasibility \
         ${FLUXION_RESOURCE_OPTIONS:-"load-allowlist=node,core,gpu"}
+    fi
 fi
 
 if [ -z ${FLUXION_QMANAGER_RC_NOOP} ]; then
-    flux module reload -f sched-fluxion-qmanager ${FLUXION_QMANAGER_OPTIONS}
+    if [ $(flux getattr rank) -eq 0 ]; then
+        flux module reload -f sched-fluxion-qmanager ${FLUXION_QMANAGER_OPTIONS}
+    fi
 fi
-

etc/rc3.d/01-sched-fluxion

@@ -1,6 +1,10 @@
 #!/bin/sh
 
-test $(flux getattr rank) -eq 0 || exit 0
+# Can be loaded on multiple ranks
+flux module remove -f sched-fluxion-feasibility
+
+if [ $(flux getattr rank) -eq 0 ]; then
+    flux module remove -f sched-fluxion-qmanager
+    flux module remove -f sched-fluxion-resource
+fi
 
-flux module remove -f sched-fluxion-qmanager
-flux module remove -f sched-fluxion-resource

qmanager/modules/qmanager.cpp

@@ -305,42 +305,6 @@ static void status_request_cb (flux_t *h, flux_msg_handler_t *w, const flux_msg_
         flux_log_error (h, "%s: flux_respond_error", __FUNCTION__);
 }
 
-static void feasibility_request_cb (flux_t *h,
-                                    flux_msg_handler_t *w,
-                                    const flux_msg_t *msg,
-                                    void *arg)
-{
-    size_t size = 0;
-    flux_future_t *f = nullptr;
-    const char *data = nullptr;
-
-    if (flux_request_decode_raw (msg, nullptr, (const void **)&data, &size) < 0)
-        goto error;
-    if (!(f = flux_rpc_raw (h,
-                            "sched-fluxion-resource.satisfiability",
-                            data,
-                            size,
-                            FLUX_NODEID_ANY,
-                            0))) {
-        flux_log_error (h, "%s: flux_rpc (sched-fluxion-resource.satisfiability)", __FUNCTION__);
-        goto error;
-    }
-    if (flux_rpc_get_raw (f, (const void **)&data, &size) < 0)
-        goto error;
-    if (flux_respond_raw (h, msg, (const void *)data, size) < 0) {
-        flux_log_error (h, "%s: flux_respond_raw", __FUNCTION__);
-        goto error;
-    }
-    flux_log (h, LOG_DEBUG, "%s: feasibility succeeded", __FUNCTION__);
-    flux_future_destroy (f);
-    return;
-
-error:
-    if (flux_respond_error (h, msg, errno, flux_future_error_string (f)) < 0)
-        flux_log_error (h, "%s: flux_respond_error", __FUNCTION__);
-    flux_future_destroy (f);
-}
-
 static void params_request_cb (flux_t *h, flux_msg_handler_t *w, const flux_msg_t *msg, void *arg)
 {
     int saved_errno;
@@ -599,7 +563,6 @@ static void qmanager_destroy (std::shared_ptr<qmanager_ctx_t> &ctx)
 
 static const struct flux_msg_handler_spec htab[] = {
     {FLUX_MSGTYPE_REQUEST, "sched.resource-status", status_request_cb, FLUX_ROLE_USER},
-    {FLUX_MSGTYPE_REQUEST, "*.feasibility", feasibility_request_cb, FLUX_ROLE_USER},
     {FLUX_MSGTYPE_REQUEST, "*.params", params_request_cb, FLUX_ROLE_USER},
     FLUX_MSGHANDLER_TABLE_END,
 };

resource/modules/CMakeLists.txt

@@ -1,11 +1,27 @@
-flux_add_plugin ( sched-fluxion-resource MODULE
+add_library(sched-fluxion-resource-module SHARED
     ${CMAKE_CURRENT_SOURCE_DIR}/resource_match.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/resource_match.hpp
     ${CMAKE_CURRENT_SOURCE_DIR}/resource_match_opts.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/resource_match_opts.hpp
     )
-target_link_libraries (sched-fluxion-resource PRIVATE
+target_link_libraries (sched-fluxion-resource-module PUBLIC
     resource
     PkgConfig::JANSSON
     PkgConfig::UUID
     cppwrappers
     )
+install(TARGETS sched-fluxion-resource-module LIBRARY)
+
+flux_add_plugin ( sched-fluxion-resource MODULE
+    ${CMAKE_CURRENT_SOURCE_DIR}/resource.cpp
+    )
+flux_add_plugin ( sched-fluxion-feasibility MODULE
+    ${CMAKE_CURRENT_SOURCE_DIR}/feasibility.cpp
+    )
+
+target_link_libraries (sched-fluxion-resource PRIVATE
+	sched-fluxion-resource-module
+    )
+target_link_libraries (sched-fluxion-feasibility PRIVATE
+	sched-fluxion-resource-module
+    )