From 41ac10475d668b25f19ebc55f6174ee717c737db Mon Sep 17 00:00:00 2001 From: Albert Chu Date: Thu, 9 Jul 2020 10:36:00 -0700 Subject: [PATCH] Globally rename whitelist to allowlist Fixes #669 --- etc/sched-fluxion-resource-start | 2 +- resource/modules/resource_match.cpp | 20 +++++++++--------- resource/readers/resource_reader_base.cpp | 14 ++++++------- resource/readers/resource_reader_base.hpp | 14 ++++++------- resource/readers/resource_reader_grug.cpp | 2 +- resource/readers/resource_reader_grug.hpp | 4 ++-- resource/readers/resource_reader_hwloc.cpp | 24 +++++++++++----------- resource/readers/resource_reader_hwloc.hpp | 4 ++-- resource/readers/resource_reader_jgf.cpp | 2 +- resource/readers/resource_reader_jgf.hpp | 4 ++-- resource/utilities/command.hpp | 2 +- resource/utilities/resource-query.cpp | 24 +++++++++++----------- src/cmd/flux-tree | 2 +- t/t1002-qmanager-reload.t | 2 +- t/t1003-qmanager-policy.t | 2 +- t/t1004-qmanager-optimize.t | 2 +- t/t1007-recovery-full.t | 8 ++++---- t/t1008-recovery-none.t | 4 ++-- t/t1009-recovery-multiqueue.t | 4 ++-- t/t2000-tree-basic.t | 4 ++-- t/t2001-tree-real.t | 2 +- t/t4004-match-hwloc.t | 4 ++-- t/t4009-match-update.t | 4 ++-- 23 files changed, 77 insertions(+), 77 deletions(-) diff --git a/etc/sched-fluxion-resource-start b/etc/sched-fluxion-resource-start index c62f00f1b..01eda3d04 100755 --- a/etc/sched-fluxion-resource-start +++ b/etc/sched-fluxion-resource-start @@ -19,7 +19,7 @@ # load it via FLUX_RC_EXTRA, the in-tree version can be loaded. if [ -z ${FLUXION_RESOURCE_RC_NOOP} ]; then - FLUXION_RESOURCE_OPTIONS=${FLUXION_RESOURCE_OPTIONS:-"load-whitelist=node,core,gpu"} + FLUXION_RESOURCE_OPTIONS=${FLUXION_RESOURCE_OPTIONS:-"load-allowlist=node,core,gpu"} flux module reload -f sched-fluxion-resource ${FLUXION_RESOURCE_OPTIONS} fi diff --git a/resource/modules/resource_match.cpp b/resource/modules/resource_match.cpp index 2671eae10..644d2c76c 100644 --- a/resource/modules/resource_match.cpp +++ b/resource/modules/resource_match.cpp @@ -55,7 +55,7 @@ using namespace Flux::resource_model; struct resource_args_t { std::string load_file; /* load file name */ std::string load_format; /* load reader format */ - std::string load_whitelist; /* load resource whitelist */ + std::string load_allowlist; /* load resource allowlist */ std::string match_subsystems; std::string match_policy; std::string prune_filters; @@ -160,7 +160,7 @@ static void set_default_args (resource_args_t &args) { args.load_file = ""; args.load_format = "hwloc"; - args.load_whitelist = ""; + args.load_allowlist = ""; args.match_subsystems = "containment"; args.match_policy = "high"; args.prune_filters = "ALL:core"; @@ -222,9 +222,9 @@ static int process_args (std::shared_ptr &ctx, args.load_format = dflt; } args.load_format = strstr (argv[i], "=") + 1; - } else if (!strncmp ("load-whitelist=", - argv[i], sizeof ("load-whitelist"))) { - args.load_whitelist = strstr (argv[i], "=") + 1; + } else if (!strncmp ("load-allowlist=", + argv[i], sizeof ("load-allowlist"))) { + args.load_allowlist = strstr (argv[i], "=") + 1; } else if (!strncmp ("subsystems=", argv[i], sizeof ("subsystems"))) { dflt = args.match_subsystems; args.match_subsystems = strstr (argv[i], "=") + 1; @@ -457,11 +457,11 @@ static int populate_resource_db (std::shared_ptr &ctx) __FUNCTION__); goto done; } - if (ctx->args.load_whitelist != "") { - if (rd->set_whitelist (ctx->args.load_whitelist) < 0) - flux_log (ctx->h, LOG_ERR, "%s: setting whitelist", __FUNCTION__); - if (!rd->is_whitelist_supported ()) - flux_log (ctx->h, LOG_WARNING, "%s: whitelist unsupported", + if (ctx->args.load_allowlist != "") { + if (rd->set_allowlist (ctx->args.load_allowlist) < 0) + flux_log (ctx->h, LOG_ERR, "%s: setting allowlist", __FUNCTION__); + if (!rd->is_allowlist_supported ()) + flux_log (ctx->h, LOG_WARNING, "%s: allowlist unsupported", __FUNCTION__); } diff --git a/resource/readers/resource_reader_base.cpp b/resource/readers/resource_reader_base.cpp index 212d48c47..ce3526674 100644 --- a/resource/readers/resource_reader_base.cpp +++ b/resource/readers/resource_reader_base.cpp @@ -40,10 +40,10 @@ using namespace Flux::resource_model; * * ********************************************************************************/ -bool resource_reader_base_t::in_whitelist (const std::string &resource) +bool resource_reader_base_t::in_allowlist (const std::string &resource) { - return whitelist.empty () - || (whitelist.find (resource) != whitelist.end ()); + return allowlist.empty () + || (allowlist.find (resource) != allowlist.end ()); } @@ -58,7 +58,7 @@ resource_reader_base_t::~resource_reader_base_t () } -int resource_reader_base_t::set_whitelist (const std::string &csl) +int resource_reader_base_t::set_allowlist (const std::string &csl) { if (csl == "") return 0; @@ -72,13 +72,13 @@ int resource_reader_base_t::set_whitelist (const std::string &csl) while ((pos = csl_copy.find (sep)) != std::string::npos) { std::string resource = csl_copy.substr (0, pos); if (resource != "") - whitelist.insert (resource); + allowlist.insert (resource); csl_copy.erase (0, pos + sep.length ()); } if (csl_copy != "") - whitelist.insert (csl_copy); + allowlist.insert (csl_copy); errno = EINVAL; - rc = whitelist.empty ()? -1 : 0; + rc = allowlist.empty ()? -1 : 0; } catch (std::out_of_range &e) { errno = EINVAL; rc = -1; diff --git a/resource/readers/resource_reader_base.hpp b/resource/readers/resource_reader_base.hpp index 4a1ea6edc..1b5b23597 100644 --- a/resource/readers/resource_reader_base.hpp +++ b/resource/readers/resource_reader_base.hpp @@ -83,19 +83,19 @@ class resource_reader_base_t { const std::string &str, int64_t jobid, int64_t at, uint64_t dur, bool rsv, uint64_t trav_token) = 0; - /*! Set the whitelist: only resources that are part of this whitelist + /*! Set the allowlist: only resources that are part of this allowlist * will be unpacked into the graph. * - * \param csl comma separated whitelist string + * \param csl comma separated allowlist string * \return 0 on success; non-zero integer on an error */ - int set_whitelist (const std::string &csl); + int set_allowlist (const std::string &csl); - /*! Is the selected reader format support whitelist + /*! Is the selected reader format support allowlist * * \return true when supported */ - virtual bool is_whitelist_supported () = 0; + virtual bool is_allowlist_supported () = 0; /*! Return the error message string. */ @@ -106,8 +106,8 @@ class resource_reader_base_t { void clear_err_message (); protected: - bool in_whitelist (const std::string &resource); - std::set whitelist; + bool in_allowlist (const std::string &resource); + std::set allowlist; std::string m_err_msg = ""; }; diff --git a/resource/readers/resource_reader_grug.cpp b/resource/readers/resource_reader_grug.cpp index af62c88a1..50c22ad46 100644 --- a/resource/readers/resource_reader_grug.cpp +++ b/resource/readers/resource_reader_grug.cpp @@ -475,7 +475,7 @@ int resource_reader_grug_t::update (resource_graph_t &g, return -1; } -bool resource_reader_grug_t::is_whitelist_supported () +bool resource_reader_grug_t::is_allowlist_supported () { return false; } diff --git a/resource/readers/resource_reader_grug.hpp b/resource/readers/resource_reader_grug.hpp index f7c3fe8f9..36db28673 100644 --- a/resource/readers/resource_reader_grug.hpp +++ b/resource/readers/resource_reader_grug.hpp @@ -83,11 +83,11 @@ class resource_reader_grug_t : public resource_reader_base_t { const std::string &str, int64_t jobid, int64_t at, uint64_t dur, bool rsv, uint64_t trav_token); - /*! Is the selected reader format support whitelist + /*! Is the selected reader format support allowlist * * \return false */ - virtual bool is_whitelist_supported (); + virtual bool is_allowlist_supported (); private: resource_gen_spec_t m_gspec; diff --git a/resource/readers/resource_reader_hwloc.cpp b/resource/readers/resource_reader_hwloc.cpp index f9e7b9d0c..73d1aceec 100644 --- a/resource/readers/resource_reader_hwloc.cpp +++ b/resource/readers/resource_reader_hwloc.cpp @@ -126,7 +126,7 @@ void resource_reader_hwloc_t::walk_hwloc (resource_graph_t &g, case HWLOC_OBJ_MACHINE: { // TODO: add signature to support multiple ranks per node const char *hwloc_name = hwloc_obj_get_info_by_name (obj, "HostName"); - if (!hwloc_name || !in_whitelist ("node")) { + if (!hwloc_name || !in_allowlist ("node")) { supported_resource = false; break; } @@ -136,7 +136,7 @@ void resource_reader_hwloc_t::walk_hwloc (resource_graph_t &g, break; } case HWLOC_OBJ_GROUP: { - if (!in_whitelist ("group")) { + if (!in_allowlist ("group")) { supported_resource = false; break; } @@ -145,7 +145,7 @@ void resource_reader_hwloc_t::walk_hwloc (resource_graph_t &g, break; } case HWLOC_OBJ_NUMANODE: { - if (!in_whitelist ("numanode")) { + if (!in_allowlist ("numanode")) { supported_resource = false; break; } @@ -154,7 +154,7 @@ void resource_reader_hwloc_t::walk_hwloc (resource_graph_t &g, break; } case HWLOC_OBJ_PACKAGE: { - if (!in_whitelist ("socket")) { + if (!in_allowlist ("socket")) { supported_resource = false; break; } @@ -165,7 +165,7 @@ void resource_reader_hwloc_t::walk_hwloc (resource_graph_t &g, #if HWLOC_API_VERSION < 0x00020000 case HWLOC_OBJ_CACHE: { std::string r = "L" + std::to_string (obj->attr->cache.depth) + "cache"; - if (!in_whitelist (r)) { + if (!in_allowlist (r)) { supported_resource = false; break; } @@ -176,7 +176,7 @@ void resource_reader_hwloc_t::walk_hwloc (resource_graph_t &g, } #else case HWLOC_OBJ_L1CACHE: { - if (!in_whitelist ("L1cache")) { + if (!in_allowlist ("L1cache")) { supported_resource = false; break; } @@ -186,7 +186,7 @@ void resource_reader_hwloc_t::walk_hwloc (resource_graph_t &g, break; } case HWLOC_OBJ_L2CACHE: { - if (!in_whitelist ("L2cache")) { + if (!in_allowlist ("L2cache")) { supported_resource = false; break; } @@ -196,7 +196,7 @@ void resource_reader_hwloc_t::walk_hwloc (resource_graph_t &g, break; } case HWLOC_OBJ_L3CACHE: { - if (!in_whitelist ("L3cache")) { + if (!in_allowlist ("L3cache")) { supported_resource = false; break; } @@ -207,7 +207,7 @@ void resource_reader_hwloc_t::walk_hwloc (resource_graph_t &g, } #endif case HWLOC_OBJ_CORE: { - if (!in_whitelist ("core")) { + if (!in_allowlist ("core")) { supported_resource = false; break; } @@ -216,7 +216,7 @@ void resource_reader_hwloc_t::walk_hwloc (resource_graph_t &g, break; } case HWLOC_OBJ_PU: { - if (!in_whitelist ("pu")) { + if (!in_allowlist ("pu")) { supported_resource = false; break; } @@ -226,7 +226,7 @@ void resource_reader_hwloc_t::walk_hwloc (resource_graph_t &g, } case HWLOC_OBJ_OS_DEVICE: { if (obj->attr && obj->attr->osdev.type == HWLOC_OBJ_OSDEV_COPROC) { - if (!in_whitelist ("gpu")) { + if (!in_allowlist ("gpu")) { supported_resource = false; break; } @@ -370,7 +370,7 @@ int resource_reader_hwloc_t::update (resource_graph_t &g, return -1; } -bool resource_reader_hwloc_t::is_whitelist_supported () +bool resource_reader_hwloc_t::is_allowlist_supported () { return true; } diff --git a/resource/readers/resource_reader_hwloc.hpp b/resource/readers/resource_reader_hwloc.hpp index c9db2dc5b..8045f4573 100644 --- a/resource/readers/resource_reader_hwloc.hpp +++ b/resource/readers/resource_reader_hwloc.hpp @@ -87,11 +87,11 @@ class resource_reader_hwloc_t : public resource_reader_base_t { const std::string &str, int64_t jobid, int64_t at, uint64_t dur, bool rsv, uint64_t trav_token); - /*! Is the hwloc reader format support whitelist + /*! Is the hwloc reader format support allowlist * * \return true */ - virtual bool is_whitelist_supported (); + virtual bool is_allowlist_supported (); private: int check_hwloc_version (std::string &m_err_msg); diff --git a/resource/readers/resource_reader_jgf.cpp b/resource/readers/resource_reader_jgf.cpp index 3ba02236e..6e946c051 100644 --- a/resource/readers/resource_reader_jgf.cpp +++ b/resource/readers/resource_reader_jgf.cpp @@ -851,7 +851,7 @@ int resource_reader_jgf_t::update (resource_graph_t &g, return rc; } -bool resource_reader_jgf_t::is_whitelist_supported () +bool resource_reader_jgf_t::is_allowlist_supported () { return false; } diff --git a/resource/readers/resource_reader_jgf.hpp b/resource/readers/resource_reader_jgf.hpp index c556fdf1b..cea5e3a63 100644 --- a/resource/readers/resource_reader_jgf.hpp +++ b/resource/readers/resource_reader_jgf.hpp @@ -87,11 +87,11 @@ class resource_reader_jgf_t : public resource_reader_base_t { const std::string &str, int64_t jobid, int64_t at, uint64_t dur, bool rsv, uint64_t trav_token); - /*! Is the selected reader format support whitelist + /*! Is the selected reader format support allowlist * * \return false */ - virtual bool is_whitelist_supported (); + virtual bool is_allowlist_supported (); private: int fetch_jgf (const std::string &str, diff --git a/resource/utilities/command.hpp b/resource/utilities/command.hpp index 090dfc2e4..fea15c0b7 100644 --- a/resource/utilities/command.hpp +++ b/resource/utilities/command.hpp @@ -41,7 +41,7 @@ namespace resource_model { struct test_params_t { std::string load_file; /* load file name */ std::string load_format; /* load reader format */ - std::string load_whitelist; /* load resource whitelist */ + std::string load_allowlist; /* load resource allowlist */ std::string matcher_name; /* Matcher name */ std::string matcher_policy; /* Matcher policy name */ std::string o_fname; /* Output file to dump the filtered graph */ diff --git a/resource/utilities/resource-query.cpp b/resource/utilities/resource-query.cpp index 4ee20b19e..5e8255a21 100644 --- a/resource/utilities/resource-query.cpp +++ b/resource/utilities/resource-query.cpp @@ -51,7 +51,7 @@ using namespace Flux::resource_model; static const struct option longopts[] = { {"load-file", required_argument, 0, 'L'}, {"load-format", required_argument, 0, 'f'}, - {"load-whitelist", required_argument, 0, 'W'}, + {"load-allowlist", required_argument, 0, 'W'}, {"match-subsystems", required_argument, 0, 'S'}, {"match-policy", required_argument, 0, 'P'}, {"match-format", required_argument, 0, 'F'}, @@ -114,8 +114,8 @@ static void usage (int code) " -f, --load-format=\n" " Format of the load file (default=grug)\n" "\n" -" -W, --load-whitelist=\n" -" Whitelist of resource types to be loaded\n" +" -W, --load-allowlist=\n" +" Allowlist of resource types to be loaded\n" " Resources that are not included in this list will be filtered out\n" "\n" " -S, --match-subsystems=" @@ -194,7 +194,7 @@ static void set_default_params (std::shared_ptr &ctx) { ctx->params.load_file = "conf/default"; ctx->params.load_format = "grug"; - ctx->params.load_whitelist = ""; + ctx->params.load_allowlist = ""; ctx->params.matcher_name = "CA"; ctx->params.matcher_policy = "high"; ctx->params.o_fname = ""; @@ -465,11 +465,11 @@ static int populate_resource_db (std::shared_ptr &ctx) std::cerr << "ERROR: Can't create load reader " << std::endl; goto done; } - if (ctx->params.load_whitelist != "") { - if (rd->set_whitelist (ctx->params.load_whitelist) < 0) - std::cerr << "ERROR: Can't set whitelist" << std::endl; - if (!rd->is_whitelist_supported ()) - std::cout << "WARN: whitelist unsupported" << std::endl; + if (ctx->params.load_allowlist != "") { + if (rd->set_allowlist (ctx->params.load_allowlist) < 0) + std::cerr << "ERROR: Can't set allowlist" << std::endl; + if (!rd->is_allowlist_supported ()) + std::cout << "WARN: allowlist unsupported" << std::endl; } in_file.open (ctx->params.load_file.c_str (), std::ifstream::in); @@ -620,11 +620,11 @@ static void process_args (std::shared_ptr &ctx, usage (1); } break; - case 'W': /* --hwloc-whitelist */ + case 'W': /* --hwloc-allowlist */ token = optarg; if(token.find_first_not_of(' ') != std::string::npos) { - ctx->params.load_whitelist += "cluster,"; - ctx->params.load_whitelist += token; + ctx->params.load_allowlist += "cluster,"; + ctx->params.load_allowlist += token; } break; case 'S': /* --match-subsystems */ diff --git a/src/cmd/flux-tree b/src/cmd/flux-tree index c37226344..91413d345 100755 --- a/src/cmd/flux-tree +++ b/src/cmd/flux-tree @@ -411,7 +411,7 @@ apply_policies() { fi if [[ "${match_policy}" != "default" ]] then - export FLUXION_RESOURCE_OPTIONS="hwloc-whitelist=node,core,gpu \ + export FLUXION_RESOURCE_OPTIONS="hwloc-allowlist=node,core,gpu \ policy=${match_policy}" fi if [[ "x${FT_DRY_RUN}" = "xyes" ]] diff --git a/t/t1002-qmanager-reload.t b/t/t1002-qmanager-reload.t index bd7b9babf..9f6a70639 100755 --- a/t/t1002-qmanager-reload.t +++ b/t/t1002-qmanager-reload.t @@ -36,7 +36,7 @@ test_expect_success 'qmanager: hwloc reload works' ' test_expect_success 'qmanager: loading resource and qmanager modules works' ' flux module remove sched-simple && load_resource prune-filters=ALL:core \ -subsystems=containment policy=low load-whitelist=node,socket,core,gpu && +subsystems=containment policy=low load-allowlist=node,socket,core,gpu && load_qmanager ' diff --git a/t/t1003-qmanager-policy.t b/t/t1003-qmanager-policy.t index 85194d236..cd93dcb95 100755 --- a/t/t1003-qmanager-policy.t +++ b/t/t1003-qmanager-policy.t @@ -35,7 +35,7 @@ test_expect_success 'qmanager: hwloc reload works' ' test_expect_success 'qmanager: loading qmanager (queue-policy=easy)' ' flux module remove sched-simple && load_resource prune-filters=ALL:core \ -subsystems=containment policy=low load-whitelist=cluster,node,core && +subsystems=containment policy=low load-allowlist=cluster,node,core && load_qmanager queue-policy=easy ' diff --git a/t/t1004-qmanager-optimize.t b/t/t1004-qmanager-optimize.t index 891b35388..a832ed443 100755 --- a/t/t1004-qmanager-optimize.t +++ b/t/t1004-qmanager-optimize.t @@ -35,7 +35,7 @@ test_expect_success 'qmanager: hwloc reload works' ' test_expect_success 'qmanager: loading with easy+queue-depth=5' ' flux module remove sched-simple && load_resource prune-filters=ALL:core \ -subsystems=containment policy=low load-whitelist=cluster,node,core && +subsystems=containment policy=low load-allowlist=cluster,node,core && load_qmanager queue-policy=easy \ queue-params=queue-depth=5 ' diff --git a/t/t1007-recovery-full.t b/t/t1007-recovery-full.t index 0799ac860..769307245 100755 --- a/t/t1007-recovery-full.t +++ b/t/t1007-recovery-full.t @@ -26,7 +26,7 @@ test_expect_success 'recovery: hwloc reload works' ' test_expect_success 'recovery: loading flux-sched modules works (rv1)' ' flux module remove sched-simple && flux module reload -f resource && - load_resource load-whitelist=node,core,gpu match-format=rv1 && + load_resource load-allowlist=node,core,gpu match-format=rv1 && load_qmanager ' @@ -51,7 +51,7 @@ test_expect_success 'recovery: cancel one running job without fluxion' ' ' test_expect_success 'recovery: works when both modules restart (rv1)' ' - reload_resource load-whitelist=node,core,gpu match-format=rv1 && + reload_resource load-allowlist=node,core,gpu match-format=rv1 && reload_qmanager && test_must_fail flux ion-resource info ${jobid1} && flux ion-resource info ${jobid2} | grep "ALLOCATED" && @@ -83,7 +83,7 @@ test_expect_success 'recovery: a cancel leads to a job schedule (rv1)' ' ' test_expect_success 'recovery: both modules restart (rv1->rv1_nosched)' ' - reload_resource load-whitelist=node,core,gpu match-format=rv1_nosched && + reload_resource load-allowlist=node,core,gpu match-format=rv1_nosched && reload_qmanager && flux ion-resource info ${jobid4} | grep "ALLOCATED" && flux ion-resource info ${jobid5} | grep "ALLOCATED" && @@ -108,7 +108,7 @@ test_expect_success 'recovery: cancel all jobs (rv1_nosched)' ' ' test_expect_success 'recovery: restart w/ no running jobs (rv1_nosched)' ' - reload_resource load-whitelist=node,core,gpu match-format=rv1_nosched && + reload_resource load-allowlist=node,core,gpu match-format=rv1_nosched && reload_qmanager ' diff --git a/t/t1008-recovery-none.t b/t/t1008-recovery-none.t index 699d5e10d..323627460 100755 --- a/t/t1008-recovery-none.t +++ b/t/t1008-recovery-none.t @@ -26,7 +26,7 @@ test_expect_success 'recovery: hwloc reload works' ' test_expect_success 'recovery: loading flux-sched modules works (rv1_nosched)' ' flux module remove sched-simple && flux module reload -f resource && - load_resource load-whitelist=node,core,gpu match-format=rv1_nosched && + load_resource load-allowlist=node,core,gpu match-format=rv1_nosched && load_qmanager ' @@ -36,7 +36,7 @@ test_expect_success 'recovery: submit a job (rv1_nosched)' ' ' test_expect_success 'recovery: qmanager w/o an option must fail (rv1_nosched)' ' - reload_resource load-whitelist=node,core,gpu match-format=rv1_nosched && + reload_resource load-allowlist=node,core,gpu match-format=rv1_nosched && test_must_fail reload_qmanager ' diff --git a/t/t1009-recovery-multiqueue.t b/t/t1009-recovery-multiqueue.t index 0032fb991..fbcf5907b 100755 --- a/t/t1009-recovery-multiqueue.t +++ b/t/t1009-recovery-multiqueue.t @@ -38,7 +38,7 @@ test_expect_success 'recovery: hwloc reload works' ' test_expect_success 'recovery: loading flux-sched modules with two queues' ' flux module remove sched-simple && flux module reload -f resource && - load_resource load-whitelist=node,core,gpu match-format=rv1 && + load_resource load-allowlist=node,core,gpu match-format=rv1 && load_qmanager "queues=batch debug" ' @@ -54,7 +54,7 @@ test_expect_success 'recovery: submit to occupy resources fully (rv1)' ' test_expect_success 'recovery: works when both modules restart (rv1)' ' flux dmesg -C && - reload_resource load-whitelist=node,core,gpu match-format=rv1 && + reload_resource load-allowlist=node,core,gpu match-format=rv1 && reload_qmanager "queues=batch debug" && check_requeue ${jobid1} batch && check_requeue ${jobid2} debug && diff --git a/t/t2000-tree-basic.t b/t/t2000-tree-basic.t index 3bf9bb185..8b2fca7e5 100755 --- a/t/t2000-tree-basic.t +++ b/t/t2000-tree-basic.t @@ -493,7 +493,7 @@ EOF test_expect_success 'flux-tree: combining -T -M works' ' cat >cmp.16 <<-EOF && FLUXION_QMANAGER_OPTIONS: - FLUXION_RESOURCE_OPTIONS:hwloc-whitelist=node,core,gpu policy=low + FLUXION_RESOURCE_OPTIONS:hwloc-allowlist=node,core,gpu policy=low Rank=1: N=1 c=4 Rank=1: T=--topology=2 Rank=1: M=--match-policy=high @@ -551,7 +551,7 @@ EOF test_expect_success 'flux-tree: existing FLUXION_RESOURCE_OPTIONS is respected' ' cat >cmp.18 <<-EOF && FLUXION_QMANAGER_OPTIONS: - FLUXION_RESOURCE_OPTIONS:hwloc-whitelist=node,core,gpu policy=locality + FLUXION_RESOURCE_OPTIONS:hwloc-allowlist=node,core,gpu policy=locality Rank=1: N=1 c=1 Rank=1: T=--leaf Rank=1: diff --git a/t/t2001-tree-real.t b/t/t2001-tree-real.t index 15bc66525..47d005eb5 100755 --- a/t/t2001-tree-real.t +++ b/t/t2001-tree-real.t @@ -22,7 +22,7 @@ fi test_expect_success 'flux-tree: prep for testing in real mode works' ' flux module remove sched-simple && load_resource prune-filters=ALL:core \ -subsystems=containment policy=low load-whitelist=node,core,gpu && +subsystems=containment policy=low load-allowlist=node,core,gpu && load_qmanager ' diff --git a/t/t4004-match-hwloc.t b/t/t4004-match-hwloc.t index 65138461d..b98f3ae4a 100755 --- a/t/t4004-match-hwloc.t +++ b/t/t4004-match-hwloc.t @@ -85,7 +85,7 @@ test_expect_success 'resource-query works on gpu type query using xml (MIXED)' ' test_cmp 020.R.out ${exp_dir}/020.R.out ' -test_expect_success 'resource-query works with whitelist' ' +test_expect_success 'resource-query works with allowlist' ' sed "s~@TEST_SRCDIR@~${SHARNESS_TEST_SRCDIR}~g" ${cmd_dir}/cmds12.in > cmds12 && ${query} -L ${hwloc_4gpu} -f hwloc -S CA -P high -W node,socket,core,gpu -t 021.R.out < cmds12 && test_cmp 021.R.out ${exp_dir}/021.R.out @@ -140,7 +140,7 @@ test_expect_success 'reloading sierra xml and match allocate' ' remove_resource && flux hwloc reload ${excl_4N4B_sierra2} && load_resource subsystems=containment \ -policy=high load-whitelist=node,socket,core,gpu && +policy=high load-allowlist=node,socket,core,gpu && flux ion-resource match allocate ${jobspec_1socket_2gpu} && flux ion-resource match allocate ${jobspec_1socket_2gpu} && flux ion-resource match allocate ${jobspec_1socket_2gpu} && diff --git a/t/t4009-match-update.t b/t/t4009-match-update.t index c90d9c060..71c648fe8 100755 --- a/t/t4009-match-update.t +++ b/t/t4009-match-update.t @@ -34,7 +34,7 @@ test_expect_success 'update: hwloc reload works' ' ' test_expect_success 'update: loading sched-fluxion-resource works' ' - load_resource load-whitelist=node,core,gpu match-format=rv1 + load_resource load-allowlist=node,core,gpu match-format=rv1 ' test_expect_success 'update: resource.match-allocate works with a jobspec' ' @@ -50,7 +50,7 @@ awk "NR==5{ print; }" > R4 test_expect_success 'update: reloading sched-fluxion-resource works' ' remove_resource && - load_resource load-whitelist=node,core,gpu match-format=rv1 + load_resource load-allowlist=node,core,gpu match-format=rv1 ' test_expect_success 'update: sched-fluxion-resource.update works with R1' '