Rebase rq2 and add multi match + find

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-on: [ pull_request, push ]
+on: [ pull_request, push, workflow_dispatch ]
 name: ci
 jobs:
   check-pr:
@@ -15,7 +15,7 @@ jobs:
 
   python-format:
     name: python format
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/setup-python@v1
       with:
@@ -31,7 +31,7 @@ jobs:
 
   python-lint:
     name: python lint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/setup-python@v1
       with:

NEWS.md

@@ -1,3 +1,55 @@
+flux-sched version 0.26.0 - 2023-02-07
+--------------------------------------
+
+### New Features
+
+ * support for RFC 31 Job Constraints (#997)
+ * report Fluxion version when broker modules are loaded (#998)
+
+### Fixes
+
+ * reapi: Rename resource/hlapi to resource/reapi (#983)
+ * resource: improve error messages for jobspec parse errors (#1003)
+ * resource: fix 'Internal match error' when hostlist constraint is provided
+   (#1005)
+
+### Testsuite
+
+ * testsuite: adjust expectations of recovery in `rv1_nosched` mode (#1000)
+ * testsuite: do not assume queues started by default (#996)
+ * testsuite: start/stop all queues with --all option (#992)
+ * github: change ubuntu version for python ci (#993)
+ * testsuite: update flux-tree-helper.py for new OutputFormat constructor
+   (#985)
+
+flux-sched version 0.25.0 - 2022-10-04
+--------------------------------------
+
+Note: the flux-sched test suite requires flux-core 0.44.0 or newer.
+
+### New Features
+
+ * qmanager: support RFC33 TOML queue config (#980, #971)
+
+### Fixes
+ * Resource graph duration and job expiration to conform to RFC 14 (#969)
+ * Fix REAPI C++ bindings  (#974)
+ * add an exception note to fatal queue exceptions (#957)
+
+### Cleanup
+
+ * rc: combine fluxion rc scripts (#958)
+ * move flux-tree to the test suite (#956)
+ * build: drop unnecessary preqreqs, update README (#954)
+
+### Testsuite
+
+ * testsuite: fix coverage method for queue exception (#978)
+ * testsuite: cover queues with non-overlapping resource constraints (#976)
+ * testsuite: fix integer overflow (#968)
+ * testsuite: use explicit duration units (#966)
+ * minor cleanup (#973, #959)
+
 flux-sched version 0.24.0 - 2022-08-03
 --------------------------------------
 

configure.ac

@@ -195,9 +195,9 @@ AC_CONFIG_FILES([Makefile
   resource/utilities/Makefile
   resource/utilities/test/Makefile
   resource/modules/Makefile
-  resource/hlapi/Makefile
-  resource/hlapi/bindings/Makefile
-  resource/hlapi/bindings/c/Makefile
+  resource/reapi/Makefile
+  resource/reapi/bindings/Makefile
+  resource/reapi/bindings/c/Makefile
   resource/policies/Makefile
   resource/policies/base/Makefile
   resource/policies/base/test/Makefile

qmanager/modules/Makefile.am

@@ -24,9 +24,9 @@ sched_fluxion_qmanager_la_SOURCES = \
     $(top_srcdir)/src/common/liboptmgr/optmgr.hpp \
     $(top_srcdir)/src/common/liboptmgr/optmgr_impl.hpp \
     $(top_srcdir)/resource/libjobspec/jobspec.hpp \
-    $(top_srcdir)/resource/hlapi/bindings/c++/reapi.hpp \
-    $(top_srcdir)/resource/hlapi/bindings/c++/reapi_module.hpp \
-    $(top_srcdir)/resource/hlapi/bindings/c++/reapi_module_impl.hpp \
+    $(top_srcdir)/resource/reapi/bindings/c++/reapi.hpp \
+    $(top_srcdir)/resource/reapi/bindings/c++/reapi_module.hpp \
+    $(top_srcdir)/resource/reapi/bindings/c++/reapi_module_impl.hpp \
     $(top_srcdir)/qmanager/config/queue_system_defaults.hpp \
     $(top_srcdir)/qmanager/policies/base/queue_policy_base.hpp \
     $(top_srcdir)/qmanager/policies/base/queue_policy_base_impl.hpp \

qmanager/modules/qmanager.cpp

@@ -127,12 +127,14 @@ static int subtable_dumps (json_t *o, std::string &value)
 static int process_config_file (std::shared_ptr<qmanager_ctx_t> &ctx)
 {
     int rc = 0;
-    json_t *conf = NULL;
+    json_t *qmanager_conf = NULL, *queues_conf = NULL;
 
     if ( (rc = flux_conf_unpack (flux_get_conf (ctx->h), NULL,
-                                     "{ s?:o }",
+                                     "{ s?:o , s?:o }",
                                          "sched-fluxion-qmanager",
-                                         &conf)) < 0) {
+                                         &qmanager_conf,
+                                         "queues",
+                                         &queues_conf)) < 0) {
         flux_log_error (ctx->h, "%s: flux_conf_unpack", __FUNCTION__);
         return rc;
     }
@@ -142,8 +144,25 @@ static int process_config_file (std::shared_ptr<qmanager_ctx_t> &ctx)
     json_t *v = NULL;
     optmgr_kv_t<qmanager_opts_t> opts_store;
     std::string info_str = "";
-    json_object_foreach (conf, k, v) {
+    if (queues_conf){
+        // workaround to satisfy RFC 33
+        std::ostringstream queues;
+        json_object_foreach (queues_conf, k, v) {
+            queues << std::string(k) << " ";
+        }
+        if ( (rc = opts_store.put ("queues", queues.str()) ) < 0) {
+            flux_log_error (ctx->h, "%s: optmgr_kv_t::put ('queues', %s)",
+                             __FUNCTION__, queues.str().c_str());
+            return rc;
+        }
+    }
+    json_object_foreach (qmanager_conf, k, v) {
         std::string value;
+        if (k == std::string("queues")) {
+            flux_log_error (ctx->h, "%s: 'queues' key not supported, "
+                            "use RFC33 format instead", __FUNCTION__);
+            return -1;
+        }
         if (json_is_object (v)) {
             if (subtable_dumps (v, value) < 0) {
                 flux_log_error (ctx->h, "%s: sub_table_dumps on key=%s",
@@ -599,6 +618,7 @@ int mod_start (flux_t *h, int argc, char **argv)
         flux_log_error (h, "%s: qmanager_new", __FUNCTION__);
         return rc;
     }
+
     // Because mod_main is always active, the following is safe.
     flux_aux_set (h, "sched-fluxion-qmanager", &ctx, nullptr);
 
@@ -645,6 +665,9 @@ int mod_start (flux_t *h, int argc, char **argv)
 extern "C" int mod_main (flux_t *h, int argc, char **argv)
 {
     eh_wrapper_t exception_safe_main;
+
+    flux_log (h, LOG_INFO, "version %s", PACKAGE_VERSION);
+
     int rc = exception_safe_main (mod_start, h, argc, argv);
     if (exception_safe_main.bad ())
         flux_log_error (h, "%s: %s", __FUNCTION__,

qmanager/policies/base/queue_policy_base.hpp

@@ -25,7 +25,7 @@ extern "C" {
 #include <memory>
 #include <cstdint>
 
-#include "resource/hlapi/bindings/c++/reapi.hpp"
+#include "resource/reapi/bindings/c++/reapi.hpp"
 #include "qmanager/config/queue_system_defaults.hpp"
 
 namespace Flux {

qmanager/policies/queue_policy_factory_impl.hpp

@@ -11,9 +11,9 @@
 #ifndef QUEUE_POLICY_FACTORY_IMPL_HPP
 #define QUEUE_POLICY_FACTORY_IMPL_HPP
 
-#include "resource/hlapi/bindings/c++/reapi.hpp"
-#include "resource/hlapi/bindings/c++/reapi_module.hpp"
-#include "resource/hlapi/bindings/c++/reapi_module_impl.hpp"
+#include "resource/reapi/bindings/c++/reapi.hpp"
+#include "resource/reapi/bindings/c++/reapi_module.hpp"
+#include "resource/reapi/bindings/c++/reapi_module_impl.hpp"
 #include "qmanager/policies/base/queue_policy_base.hpp"
 #include "qmanager/policies/base/queue_policy_base_impl.hpp"
 #include "qmanager/policies/queue_policy_fcfs.hpp"

resource/Makefile.am

@@ -7,7 +7,7 @@ AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir) $(CZMQ_CFLAGS) $(FLUX_CORE_CFLAGS) \
 	      $(BOOST_CPPFLAGS)
 
-SUBDIRS = libjobspec planner . utilities modules hlapi evaluators policies
+SUBDIRS = libjobspec planner . utilities modules reapi evaluators policies
 
 noinst_LTLIBRARIES = libresource.la
 
@@ -56,6 +56,7 @@ libresource_la_SOURCES = \
     schema/data_std.hpp \
     schema/infra_data.hpp \
     schema/sched_data.hpp \
+    schema/resource_base.hpp \
     schema/resource_data.hpp \
     schema/color.hpp \
     schema/ephemeral.hpp \

resource/config/system_defaults.hpp

@@ -15,8 +15,8 @@
 namespace Flux {
 namespace resource_model {
 namespace detail {
-    const uint64_t SYSTEM_DEFAULT_DURATION = 43200; // 12 hours
-    const uint64_t SYSTEM_MAX_DURATION = 604800;    //  7 days
+    const int64_t SYSTEM_DEFAULT_DURATION = 43200; // 12 hours
+    const int64_t SYSTEM_MAX_DURATION = 3153600000; // 100 years
 } // namespace detail
 } // namespace resource_model
 } // namespace Flux

resource/evaluators/fold.hpp

@@ -20,38 +20,38 @@ namespace resource_model {
 
 namespace fold {
 struct greater {
-    bool operator() (const eval_egroup_t &a, const eval_egroup_t &b) const
+    inline bool operator() (const eval_egroup_t &a, const eval_egroup_t &b) const
     {
         return a.score > b.score;
     }
 };
 
 struct less {
-    bool operator() (const eval_egroup_t &a, const eval_egroup_t &b) const
+    inline bool operator() (const eval_egroup_t &a, const eval_egroup_t &b) const
     {
         return a.score < b.score;
     }
 };
 
 struct interval_greater {
-    bool operator() (const eval_egroup_t &a, const eval_egroup_t &b) const
+    inline bool operator() (const eval_egroup_t &a, const eval_egroup_t &b) const
     {
         return *(ivset.find (a.score)) > *(ivset.find (b.score));
     }
     boost::icl::interval_set<int64_t> ivset;
 };
 
 struct interval_less {
-    bool operator() (const eval_egroup_t &a, const eval_egroup_t &b) const
+    inline bool operator() (const eval_egroup_t &a, const eval_egroup_t &b) const
     {
         return *(ivset.find (a.score)) < *(ivset.find (b.score));
     }
     boost::icl::interval_set<int64_t> ivset;
 };
 
 struct plus {
-    const int64_t operator() (const int64_t result,
-                              const eval_egroup_t &a) const
+    inline const int64_t operator() (const int64_t &result,
+                                     const eval_egroup_t &a) const
     {
         return result + a.score;
     }

resource/jobinfo/jobinfo.hpp

@@ -12,6 +12,7 @@
 #define JOBINFO_HPP
 
 #include <string>
+#include <stdint.h>
 
 namespace Flux {
 namespace resource_model {

resource/libjobspec/Makefile.am

@@ -1,3 +1,6 @@
+AM_CPPFLAGS = \
+	-I$(top_srcdir)
+
 noinst_PROGRAMS = flux-jobspec-validate
 noinst_LTLIBRARIES = libjobspec_conv.la
 
@@ -9,7 +12,43 @@ flux_jobspec_validate_LDADD = \
 libjobspec_conv_la_CXXFLAGS = \
 	$(WARNING_CXXFLAGS) \
 	$(CODE_COVERAGE_CXXFLAGS) \
-	$(YAMLCPP_CFLAGS)
-libjobspec_conv_la_LIBADD = $(CODE_COVERAGE_LIBS) $(YAMLCPP_LIBS)
-libjobspec_conv_la_SOURCES = jobspec.cpp jobspec.hpp
+	$(YAMLCPP_CFLAGS) \
+	$(FLUX_HOSTLIST_CFLAGS) \
+	$(FLUX_IDSET_CFLAGS)
+
+libjobspec_conv_la_LIBADD = \
+	$(CODE_COVERAGE_LIBS) \
+	$(YAMLCPP_LIBS) \
+	$(FLUX_HOSTLIST_LIBS) \
+	$(FLUX_IDSET_LIBS)
+
+libjobspec_conv_la_SOURCES = \
+	jobspec.cpp \
+	jobspec.hpp \
+	parse_error.hpp \
+	constraint.hpp \
+	constraint.cpp \
+	hostlist_constraint.hpp \
+	hostlist_constraint.cpp \
+	rank_constraint.hpp \
+	rank_constraint.cpp
+
+TESTS = \
+	test_constraint.t
 
+check_PROGRAMS = \
+	$(TESTS)
+
+test_constraint_t_SOURCES = \
+	test/constraint.cpp
+test_constraint_t_CXXFLAGS = \
+	$(WARNING_CXXFLAGS) \
+	$(CODE_COVERAGE_CXXFLAGS) \
+	$(YAMLCPP_CFLAGS)
+test_constraint_t_LDADD = \
+	$(CODE_COVERAGE_LIBS) \
+	$(YAMLCPP_LIBS) \
+	libjobspec_conv.la \
+	$(top_builddir)/src/common/libtap/libtap.la
+test_constraint_t_LDFLAGS = \
+	-no-install